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

Merge develop into ammunation

Browse Source
This commit is contained in:
VegaZ
2021-04-16 19:18:01 +02:00
parent a95ec44baa 95ae4cd227
commit 8799bfe81b
97 changed files with 7784 additions and 747 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ReallifeGamemode.Server/Admin/AntiCheat.cs
View File

@@ -26,7 +26,7 @@ namespace ReallifeGamemode.Server.Admin
{
if (!cheater.IsLoggedIn())
{
cheater.Kick();
return;
}
if(cheater.IsAdminDuty())

10
ReallifeGamemode.Server/Bank/bank.cs
View File

@@ -5,6 +5,7 @@
*/
using GTANetworkAPI;
using Newtonsoft.Json;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Finance;
@@ -60,11 +61,14 @@ namespace ReallifeGamemode.Server.Bank
{
if (client.IsInVehicle || !client.IsLoggedIn() || client.GetUser().FactionId is null) return;
if (client.GetUser().FactionLeader == true)
User user = client.GetUser();
if (user.FactionLeader == true)
{
client.TriggerEvent("showFactionBankMenuLeader", client.GetUser().Faction.BankAccount.Balance.ToString());
client.TriggerEvent("showFactionBankMenuLeader", user.Faction.BankAccount.Balance.ToString());
return;
}
client.TriggerEvent("showFactionBankMenu", client.GetUser().Faction.BankAccount.Balance.ToString());
client.TriggerEvent("showFactionBankMenu", user.Faction.BankAccount.Balance.ToString());
}
private static void EntityExitFactionBankColShape(ColShape colShape, Player client)

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

@@ -56,61 +56,6 @@ namespace ReallifeGamemode.Server.Commands
NAPI.Player.PlayPlayerAnimation(player, (int)(AnimationFlags.Loop | AnimationFlags.AllowPlayerControl | AnimationFlags.Cancellable), animDict, animName);
}
[Command("eat", "~m~Benutzung: ~s~/eat [Item]")]
public void CmdAdminEat(Player player, string item)
{
if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true)
{
ChatService.NotAuthorized(player);
return;
}
IItem iItem = InventoryManager.GetItemByName(item);
if (iItem == null)
{
ChatService.SendMessage(player, "Dieses Essen existiert nicht.");
return;
}
List<UserItem> itemList = player.GetUser().GetItems();
UserItem eatItem = itemList.FirstOrDefault(i => i.ItemId == iItem.Id);
if (eatItem == null)
{
ChatService.SendMessage(player, "Du hast dieses Item nicht");
return;
}
if (iItem is IUsableItem usableItemObj)
{
usableItemObj.Use(eatItem);
}
}
[Command("myvehicles")]
public void CmdAdminMyVehicles(Player player)
{
if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true)
{
ChatService.NotAuthorized(player);
return;
}
ChatService.SendMessage(player, "Deine Fahrzeuge: ");
int userID = player.GetUser().Id;
using (var loadData = new DatabaseContext())
{
foreach (UserVehicle v in loadData.UserVehicles)
{
if (v.UserId == userID)
{
ChatService.SendMessage(player, "~b~" + v.Model);
}
}
}
}
//TODO
[Command("fpay")]
public void FPay(Player player, string receiver, int amount)
@@ -232,7 +177,7 @@ namespace ReallifeGamemode.Server.Commands
#region Support
[Command("tog", "~m~Benutzung: ~s~/tog [Typ = ~g~IP~s~, ~g~deathlogs~s~, ~g~LC~s~]", GreedyArg = true)]
[Command("tog", "~m~Benutzung: ~s~/tog [Typ = ~g~IP~s~, ~g~deathlogs~s~, ~g~LC~s~, ~g~Connect~s~]", GreedyArg = true)]
public void CmdTog(Player player, string typ, string option1 = null, string option2 = null)
{
if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true)
@@ -281,6 +226,19 @@ namespace ReallifeGamemode.Server.Commands
player.SendNotification("~g~[Info]~w~ Leaderchat wird nun angezeigt.");
}
break;
case "connect":
if (player.HasData("togconnect"))
{
player.ResetData("togconnect");
player.SendNotification("~g~[Info]~w~ Connect-Logs werden nun ausgeblendet.");
}
else
{
player.SetData("togconnect", true);
player.SendNotification("~g~[Info]~w~ Connect-Logs werden nun angezeigt.");
}
break;
}
}
@@ -479,7 +437,7 @@ namespace ReallifeGamemode.Server.Commands
target.Kick();
}, 2500);
ChatService.BroadcastAdmin("~y~SKICK: ~w~" + targetname + " wurde von " + player.GetUser().AdminLevel.GetName() + " " + adminPlayername + " gekickt: " + reason, AdminLevel.SUPPORTER);
ChatService.BroadcastAdmin("~y~SKICK: ~w~" + target.Name + " wurde von " + player.GetUser().AdminLevel.GetName() + " " + adminPlayername + " gekickt: " + reason, AdminLevel.SUPPORTER);
}
[Command("clearchat", "~m~Benutzung: ~s~/clearchat")]
@@ -799,7 +757,7 @@ namespace ReallifeGamemode.Server.Commands
target.Kick();
}, 2500);
ChatService.Broadcast("~y~INFO: ~w~" + targetname + " wurde von " + player.GetUser().AdminLevel.GetName() + " " + adminPlayername + " gekickt: " + reason);
ChatService.Broadcast("~y~INFO: ~w~" + target.Name + " wurde von " + player.GetUser().AdminLevel.GetName() + " " + adminPlayername + " gekickt: " + reason);
}
[Command("warn", "~m~Benutzung: ~s~/warn [Player] [Grund]", GreedyArg = true)]
@@ -829,13 +787,13 @@ namespace ReallifeGamemode.Server.Commands
dbContext.SaveChanges();
if (userwarn.warn >= 3)
{
ChatService.Broadcast("~y~INFO: Das war der 3. Warn - bitte bannen!");
ChatService.BroadcastAdmin("~y~INFO: Das war der 3. Warn - bitte bannen!", AdminLevel.ADMIN);
}
}
ChatService.SendMessage(target, "~r~WARNINFO: ~w~Du wurdest von " + adminPlayername + " verwarnt: " + reason);
ChatService.Broadcast("~y~INFO: ~w~" + targetPlayername + " wurde von " + player.GetUser().AdminLevel.GetName() + " " + adminPlayername + " verwarnt: " + reason);
ChatService.BroadcastAdmin("~y~INFO: ~w~" + targetPlayername + " wurde von " + player.GetUser().AdminLevel.GetName() + " " + adminPlayername + " verwarnt: " + reason, AdminLevel.ADMIN);
}
[Command("ip", "~m~Benutzung: ~s~/ip [Spieler]")]
@@ -1327,6 +1285,12 @@ namespace ReallifeGamemode.Server.Commands
return;
}
if (target.GetData<bool>("isDead") == true)
{
ChatService.ErrorMessage(player, "Dieser Spieler ist tot. Nutze /arevive.");
return;
}
target.SafeSetHealth(hp);
ChatService.SendMessage(target, "~b~Deine HP wurden von " + player.Name + " auf " + hp + " gesetzt.");
ChatService.SendMessage(player, "~b~Du hast die HP von " + target.Name + " auf " + hp + " gesetzt.");
@@ -1438,6 +1402,13 @@ namespace ReallifeGamemode.Server.Commands
}
target.TriggerEvent("onPlayerRevived");
target.SendNotification("Du wurdest von Admin ~y~" + player.Name + "~s~ wiederbelebt.");
MedicTask task = Medic.ReviveTasks.FirstOrDefault(t => t.Victim == player.Name);
if (task != null)
{
ChatService.BroadcastFaction("~y~[MEDIC] ~w~Der Auftrag von " + target.Name + " wurde entfernt (Administrativ wiederbelebt)", new List<int>() { 2 });
}
target.SetData("isDead", false);
using (var dbContext = new DatabaseContext())
{
@@ -2012,7 +1983,7 @@ namespace ReallifeGamemode.Server.Commands
foreach (var managedPlayer in peopleInRange)
{
if (!managedPlayer.IsLoggedIn()) return;
if (!managedPlayer.IsLoggedIn() || managedPlayer.GetData<bool>("isDead")) continue;
managedPlayer.SafeSetHealth(hp);
ChatService.SendMessage(managedPlayer, "~b~Admin " + player.Name + " hat im Radius von " + radius + " die HP auf " + hp + " gesetzt.");
}
@@ -2292,6 +2263,91 @@ namespace ReallifeGamemode.Server.Commands
}
}
[Command("setshopitem", "~m~Benutzung: ~s~/setshopitem [Item ID]")]
public void CmdAdminSetItemInShop(Player player, int itemId)
{
if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true)
{
ChatService.NotAuthorized(player);
return;
}
IItem item = InventoryManager.GetItemById(itemId);
if (item is null)
{
ChatService.ErrorMessage(player, "Item existiert nicht");
return;
}
ItemshopPoint nearestItemShopPoint = PositionManager.itemshopPoints.Find(s => s.Position.DistanceTo(player.Position) <= 1.5);
if (nearestItemShopPoint is null)
{
ChatService.ErrorMessage(player, "Du bist nicht an einem Item Shop");
return;
}
using var dbContext = new DatabaseContext();
if (dbContext.ShopItems.Where(i => i.ShopId == nearestItemShopPoint.itemShop.id && i.ItemId == item.Id).FirstOrDefault() != null)
{
ChatService.ErrorMessage(player, "Item ist bereits im Shop");
return;
}
ShopItem shopItem = new ShopItem
{
ShopId = nearestItemShopPoint.itemShop.id,
ItemId = item.Id,
Amount = 20,
Price = item.Price
};
dbContext.ShopItems.Add(shopItem);
dbContext.SaveChanges();
nearestItemShopPoint.itemShop.LoadItems();
}
[Command("rmshopitem", "~m~Benutzung: ~s~/rmshopitem [Item ID]")]
public void CmdAdminRemoveItemInShop(Player player, int itemId)
{
if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true)
{
ChatService.NotAuthorized(player);
return;
}
IItem item = InventoryManager.GetItemById(itemId);
if (item is null)
{
ChatService.ErrorMessage(player, "Item existiert nicht");
return;
}
ItemshopPoint nearestItemShopPoint = PositionManager.itemshopPoints.Find(s => s.Position.DistanceTo(player.Position) <= 1.5);
if (nearestItemShopPoint is null)
{
ChatService.ErrorMessage(player, "Du bist nicht an einem Item Shop");
return;
}
using var dbContext = new DatabaseContext();
ShopItem shopItem = dbContext.ShopItems.Where(i => i.ShopId == nearestItemShopPoint.itemShop.id && i.ItemId == item.Id).FirstOrDefault();
if (shopItem is null)
{
return;
}
dbContext.ShopItems.Remove(shopItem);
dbContext.SaveChanges();
nearestItemShopPoint.itemShop.LoadItems();
}
[Command("inventory", "~m~Benutzung: ~s~/inventory [Spieler]")]
public void CmdAdminGiveItem(Player player, string targetname)
{

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

@@ -234,18 +234,19 @@ namespace ReallifeGamemode.Server.Commands
[Command("setweaponrank", "~m~Benutzung: ~s~/setweaponrank [Waffen Name] [Rank]")]
public void CmdFactionWeaponRank(Player player, string weaponModel, int rank)
{
if (player.GetUser()?.FactionId == null || player.GetUser().FactionLeader == false)
User user = player.GetUser();
if (user == null || user.FactionId == null || user.FactionLeader == false)
{
ChatService.NotAuthorized(player);
return;
}
if (rank > 12 || rank < 1)
{
ChatService.ErrorMessage(player, "Gebe einen gültigen Rang ein");
return;
}
User user = player.GetUser();
WeaponPoint nearestWeapon = PositionManager.WeaponPoints.Find(w => w.Position.DistanceTo(player.Position) <= 1.5 && w.FactionId == user.FactionId);
if (nearestWeapon == null)
{
@@ -355,15 +356,15 @@ namespace ReallifeGamemode.Server.Commands
public void CmdFactionMedicHealive(Player player, string receiver, int price = 10)
{
Player target = PlayerService.GetPlayerByNameOrId(receiver);
if (player.GetUser()?.FactionId != 2)
if(target == null || !target.IsLoggedIn())
{
ChatService.NotAuthorized(player);
ChatService.PlayerNotFound(player);
return;
}
if (player.Position.DistanceTo(target.Position) > 5)
if (player.GetUser()?.FactionId != 2)
{
ChatService.ErrorMessage(player, "Der Patient ist zu weit entfernt");
ChatService.NotAuthorized(player);
return;
}
@@ -390,6 +391,12 @@ namespace ReallifeGamemode.Server.Commands
return;
}
if (player.Position.DistanceTo(target.Position) > 5)
{
ChatService.ErrorMessage(player, "Der Patient ist zu weit entfernt");
return;
}
if (target.Health == 100)
{
ChatService.ErrorMessage(player, "Der Spieler ist bereits voll geheilt");
@@ -407,6 +414,31 @@ namespace ReallifeGamemode.Server.Commands
#region Staatsfraktionen (LSPD / FBI) Commands
[Command("m", "~m~Benutzung: ~s~/m [Message]")]
public void CmdFactionMegaphone(Player player, String message)
{
User user = player.GetUser();
if (user == null || (user.FactionId != 1 && user.FactionId != 3))
{
ChatService.NotAuthorized(player);
return;
}
if (!player.IsDuty())
{
ChatService.ErrorMessage(player, "Du bist nicht im Dienst");
return;
}
if (!player.IsInVehicle)
{
ChatService.ErrorMessage(player, "Du bist nicht in einem Fahrzeug");
return;
}
ChatService.SendInRange(player.Position, 50, "!{#FFFF00}[" + player.GetUser().Faction.Name + " " + player.Name + ": !{#FFFF00}" + message + "]");
}
[Command("cuff", "~m~Benutzung: ~s~/cuff")]
public void CmdFactionCuff(Player player)
{

39
ReallifeGamemode.Server/Commands/UserCommands.cs
View File

@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using GTANetworkAPI;
using Newtonsoft.Json;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Extensions;
@@ -16,6 +17,42 @@ namespace ReallifeGamemode.Server.Commands
{
internal class UserCommands : Script
{
[Command("look", "~m~look")]
public void CmdUserLook(Player player)
{
if (!player.IsLoggedIn()) return;
Vehicle veh = NAPI.Pools.GetAllVehicles()
.Where(v => v.Position.DistanceTo(player.Position) <= 5)
.OrderBy(v => v.Position.DistanceTo(player.Position))
.FirstOrDefault();
if (veh == null)
{
return;
}
var lastDriverDic = new Dictionary<string, DateTime>();
if(VehicleManager.lastDriversInVehicle.ContainsKey(veh))
{
lastDriverDic = VehicleManager.lastDriversInVehicle[veh];
}
else
{
player.SendNotification("~r~Mit diesem Fahrzeug ist noch niemand gefahren");
return;
}
var list = lastDriverDic.Select(v => new
{
Name = v.Key,
Time = v.Value
}).OrderByDescending(v => v.Time).ToList();
player.TriggerEvent("lookLastDrivers", JsonConvert.SerializeObject(list));
}
[Command("id", "~m~Benutzung: ~s~/id [Name]")]
public void CmdUserId(Player player, String targetname)
{
@@ -61,7 +98,7 @@ namespace ReallifeGamemode.Server.Commands
}
else
{
pVeh = NAPI.Pools.GetAllVehicles().Where(v => v.Position.DistanceTo(player.Position) <= 5).FirstOrDefault();
pVeh = NAPI.Pools.GetAllVehicles().Where(v => v.Position.DistanceTo(player.Position) <= 5).OrderBy(v => v.Position.DistanceTo(player.Position)).FirstOrDefault();
}
if (pVeh == null)

2
ReallifeGamemode.Server/Events/Chat.cs
View File

@@ -11,7 +11,7 @@ namespace ReallifeGamemode.Server.Events
{
string serverMsg = Regex.Replace(message, "(~[a-zA-Z]~)|(!{(.*)})", "");
if (serverMsg.Trim().Length == 0) return;
NAPI.Player.GetPlayersInRadiusOfPlayer(10, player).ForEach(p =>
NAPI.Player.GetPlayersInRadiusOfPlayer(25, player).ForEach(p =>
{
ChatService.SendMessage(p, $"{player.Name} sagt: {serverMsg}");
});

16
ReallifeGamemode.Server/Events/Connect.cs
View File

@@ -27,6 +27,7 @@ namespace ReallifeGamemode.Server.Events
//player.SetSharedData("vehicleAdminSpeed2", 1.0);
player.SetData("isLoggedIn", false);
player.SafeTeleport(new Vector3(-1883.736, -781.4911, -10));
player.Dimension = (uint)(player.Handle.Value + 1);
bool registered = false;
@@ -80,11 +81,16 @@ namespace ReallifeGamemode.Server.Events
bool disableLightMode = currentTime > LightModeTimeFrom && currentTime < LightModeTimeTo;
player.TriggerEvent("SERVER:Login_ShowBrowser", registered, disableLightMode);
string msg = "~m~*** " + player.Name + " [" + player.SocialClubName + "] [ID: " + player.Handle.Value + "] (" + player.Address + ")";
if (player.HasData("togip"))
{
ChatService.SendMessage(player, msg);
}
string msg = "~m~*** " + player.Name + " [" + player.SocialClubName + "] [ID: " + player.Handle.Value + "]";
string ipMsg = " (" + player.Address + ")";
ChatService.BroadcastAdmin(msg, AdminLevel.SUPPORTER, getAddInfoMessage: admin =>
{
return admin.HasData("togip") ? ipMsg : string.Empty;
},
shouldSendMessage: admin =>
{
return admin.HasData("togconnect");
});
}
private bool IsPlayerBanned(Player player)

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

@@ -94,6 +94,8 @@ namespace ReallifeGamemode.Server.Events
}
}
Medic.delHealTask(player);
if (user.JailTime <= 0)
{
user.Dead = true;
@@ -113,7 +115,6 @@ namespace ReallifeGamemode.Server.Events
MedicName = "none"
};
Medic.AddTaskToList(reviveTask);
Medic.delHealTask(player);
ChatService.BroadcastFaction("~y~[MEDIC] ~w~" + player.Name + " ist soeben verstorben.", new List<int>() { 2 });
}
@@ -238,8 +239,12 @@ namespace ReallifeGamemode.Server.Events
}
player.RemoveAllWeapons();
MedicTask task = Medic.ReviveTasks.FirstOrDefault(t => t.Victim == player.Name);
Player medicPlayer = PlayerService.GetPlayerByNameOrId(task.MedicName);
Medic.RemoveTaskFromList(task);
if(task != null)
{
Player medicPlayer = PlayerService.GetPlayerByNameOrId(task.MedicName);
Medic.RemoveTaskFromList(task);
}
player.SafeTeleport(new Vector3(-495.45, -336.33, 34.5), 0, true);
}

80
ReallifeGamemode.Server/Events/Disconnect.cs
View File

@@ -15,6 +15,8 @@ using ReallifeGamemode.Server.Services;
using ReallifeGamemode.Server.Types;
using ReallifeGamemode.Server.Report;
using ReallifeGamemode.Server.Factions.Medic;
using ReallifeGamemode.Server.Inventory.Interfaces;
using ReallifeGamemode.Server.Inventory;
/**
* @overview Life of German Reallife - Event Login (Login.cs)
@@ -30,6 +32,13 @@ namespace ReallifeGamemode.Server.Events
public void OnPlayerDisconnected(Player player, DisconnectionType type, string reason)
{
if (!player.IsLoggedIn()) return;
using var saveUser = new DatabaseContext();
User user = player.GetUser(saveUser);
if (user == null)
{
return;
}
if (type == DisconnectionType.Left)
{
@@ -41,7 +50,7 @@ namespace ReallifeGamemode.Server.Events
}
if (type == DisconnectionType.Timeout)
{
NAPI.Util.ConsoleOutput(player.Name + " Timeoutet");
NAPI.Util.ConsoleOutput(player.Name + " timed out");
}
/*if (GlobalHelper.DutyAdmins.Contains(player))
@@ -49,10 +58,23 @@ namespace ReallifeGamemode.Server.Events
GlobalHelper.DutyAdmins.Remove(player);
}*/
if (player.GetUser().IsAdmin(AdminLevel.MAPPING))
if (user.IsAdmin(AdminLevel.MAPPING))
{
ChatService.BroadcastAdmin("!{#FFFF00}*** " + player.Name + " hat den Server verlassen", AdminLevel.MAPPING);
}
MedicTask task = Medic.ReviveTasks.FirstOrDefault(t => t.Victim == player.Name);
if (task != null)
{
ChatService.BroadcastFaction("~y~[MEDIC] ~w~Info: Der Auftrag von " + player.Name + " wurde entfernt (Ausgeloggt)", new List<int>() { 2 });
}
if (player.IsAdminDuty())
{
ChatService.Broadcast("!{#ee4d2e}[SUPPORT] " + player.Name + " hat sich vom Support abgemeldet (Ausgeloggt)");
}
/*
TaxiDriverJob taxiJob = JobManager.GetJob<TaxiDriverJob>();
TaxiContract taxiContract = taxiJob.TaxiContracts.Where(t => t.Name == player.Name).FirstOrDefault();
@@ -74,8 +96,8 @@ namespace ReallifeGamemode.Server.Events
{
Report.Report.listReports.Remove(temp);
Player user = PlayerService.GetPlayerByNameOrId(temp.getUser());
user.SendChatMessage("!{#008fff}[REPORT]!{#FFFFFF} Chat beendet. Der Admin hat den Server verlassen");
Player ticketUser = PlayerService.GetPlayerByNameOrId(temp.getUser());
ticketUser.SendChatMessage("!{#008fff}[REPORT]!{#FFFFFF} Chat beendet. Der Admin hat den Server verlassen");
break;
}
@@ -124,27 +146,49 @@ namespace ReallifeGamemode.Server.Events
}
}
using (var saveUser = new DatabaseContext())
List<UserItem> fItem = saveUser.UserItems.Where(u => u.UserId == user.Id).ToList();
foreach (var item in fItem)
{
var user = player.GetUser(saveUser);
Vector3 pos = player.Position;
user.PositionX = pos.X;
user.PositionY = pos.Y;
user.PositionZ = pos.Z;
saveUser.SaveChanges();
user.Dead = player.HasData("isDead") ? (bool)player.GetData<bool>("isDead") : false;
if (user.Wanteds > 0)
IItem iItem = InventoryManager.GetItemById(item.ItemId);
if (iItem is IWeaponDealItem obj)
{
ChatService.HQMessage("Der Straftäter " + player.GetUser().Name + " ist vom Radar verschwunden");
}
int amount = item.Amount;
Vector3 dropPosition = PlayerExtension.GetPositionFromPlayer(player, 0.6f, 0);
//new Vector3(player.Position.X, player.Position.Y, player.Position.Z - 0.8f);
Random r = new Random();
GTANetworkAPI.Object grndObject;
Vector3 textPos = dropPosition;
dropPosition.Z -= 1.05f;
grndObject = NAPI.Object.CreateObject(3666746839, dropPosition, new Vector3(0, 0, r.Next(0, 360)), 255, 0);
GroundItem grndItem = new GroundItem { ItemId = iItem.Id, Amount = amount, Position = dropPosition };
TextLabel grndTxtLbl = NAPI.TextLabel.CreateTextLabel(iItem.Name + " ~s~(~y~" + amount + "~s~)", textPos, 5, 0.5f, 4, new Color(255, 255, 255), false, 0);
GroundItem.AddGroundItem(grndItem, grndObject, grndTxtLbl);
saveUser.Remove(item);
}
}
Vector3 pos = player.Position;
user.PositionX = pos.X;
user.PositionY = pos.Y;
user.PositionZ = pos.Z;
saveUser.SaveChanges();
user.Dead = player.HasData("isDead") ? (bool)player.GetData<bool>("isDead") : false;
if (user.Wanteds > 0)
{
ChatService.HQMessage("Der Straftäter " + user.Name + " ist vom Radar verschwunden");
}
player.SetData("isLoggedIn", false);
player.TriggerEvent("CLIENT:DestroyPed", 1);
player.TriggerEvent("CLIENT:DestroyPed", 2);
player.TriggerEvent("CLIENT:DestroyPed", 3);
player.TriggerEvent("CLIENT:DestroyPed", 3);
player.TriggerEvent("CLIENT:DestroyPed", 4);
Medic.delHealTask(player);

11
ReallifeGamemode.Server/Events/EnterVehicle.cs
View File

@@ -1,7 +1,9 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using GTANetworkAPI;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Managers;
using ReallifeGamemode.Server.Util;
using ReallifeGamemode.Server.WeaponDeal;
@@ -20,6 +22,13 @@ namespace ReallifeGamemode.Server.Events
if (vehicle.HasMarkerBehind())
vehicle.RemoveMarkerBehind();
if (!VehicleManager.lastDriversInVehicle.ContainsKey(vehicle))
{
VehicleManager.lastDriversInVehicle.Add(vehicle, new Dictionary<string, DateTime>());
}
VehicleManager.lastDriversInVehicle[vehicle][client.Name] = DateTime.Now;
if (vehicle.GetServerVehicle() is FactionVehicle veh)
{
User u = client.GetUser();

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

@@ -498,7 +498,7 @@ namespace ReallifeGamemode.Server.Events
List<string> stages = new List<string>();
foreach (var e in PositionManager.ElevatorPoints)
{
if (e.Position.DistanceTo2D(player.Position) <= 25 && e.Position.DistanceTo(player.Position) > 1.5)
if (e.Position.DistanceTo2D(player.Position) <= 30 && e.Position.DistanceTo(player.Position) > 1.5)
{
stages.Add(e.Stage);
}

23
ReallifeGamemode.Server/Events/Login.cs
View File

@@ -11,6 +11,8 @@ using ReallifeGamemode.Server.Util;
using ReallifeGamemode.Server.Wanted;
using ReallifeGamemode.Database.Entities;
using System;
using System.Collections.Generic;
using ReallifeGamemode.Server.Inventory.Interfaces;
/**
* @overview Life of German Reallife - Event Login (Login.cs)
@@ -105,11 +107,11 @@ namespace ReallifeGamemode.Server.Events
string addInfoStr = " (IP: " + player.Address + ")";
if(!string.IsNullOrEmpty(message))
if (!string.IsNullOrEmpty(message))
{
ChatService.BroadcastAdmin(message, AdminLevel.MAPPING, admin =>
{
if(admin.HasData("togip"))
if (admin.HasData("togip"))
{
return addInfoStr;
}
@@ -144,6 +146,21 @@ namespace ReallifeGamemode.Server.Events
{
Jail.Check_PutBehindBars(user);
}
player.Dimension = 0;
}
List<UserItem> fItem = dbContext.UserItems.Where(u => u.UserId == user.Id).ToList();
foreach (var item in fItem)
{
IItem iItem = InventoryManager.GetItemById(item.ItemId);
if (iItem is IWeaponDealItem obj)
{
player.SyncAnimation("carryBox");
player.AddAttachment("ammobox", false);
NAPI.Player.SetPlayerCurrentWeapon(player, WeaponHash.Unarmed);
break;
}
}
player.TriggerEvent("draw", player.Name, player.Handle.Value);
@@ -168,7 +185,7 @@ namespace ReallifeGamemode.Server.Events
}
}, delayTime: 1000);
if(GlobalHelper.CountdownUntil > DateTime.Now)
if (GlobalHelper.CountdownUntil > DateTime.Now)
{
player.TriggerEvent("countdown", (GlobalHelper.CountdownUntil - DateTime.Now).TotalSeconds, GlobalHelper.CountdownText);
}

10
ReallifeGamemode.Server/Events/PlayerEvent.cs
View File

@@ -13,5 +13,15 @@ namespace ReallifeGamemode.Server.Events
{
player.SafeTeleport(pos);
}
[RemoteEvent("CLIENT:SetAfkStatus")]
public void SetPlayerAfkStatus(Player player, bool status)
{
player.SetSharedData("isAfk", status);
if(status)
{
player.SendNotification("Du wurdest ~b~AFK~s~ gesetzt", true);
}
}
}
}

21
ReallifeGamemode.Server/Extensions/ClientExtension.cs
View File

@@ -31,8 +31,9 @@ namespace ReallifeGamemode.Server.Extensions
/// <returns></returns>
public static User GetUser(this Player client, DatabaseContext context = null)
{
context = context ?? new DatabaseContext();
if (!client.IsLoggedIn()) return null;
context = context ?? new DatabaseContext();
return context
.Users
.Include(u => u.Faction)
@@ -94,7 +95,7 @@ namespace ReallifeGamemode.Server.Extensions
return;
}
int time = 26 * user.Wanteds;
int time = 18 * user.Wanteds;
if (killed)
{
time *= 2;
@@ -135,6 +136,16 @@ namespace ReallifeGamemode.Server.Extensions
return player.GetServerData("duty", false);
}
public static bool IsAfk(this Player player)
{
if(!player.HasSharedData("isAfk"))
{
return false;
}
return player.GetSharedData<bool>("isAfk");
}
public static bool IsAlive(this Player player)
{
return !player.HasData("isDead") || player.GetData<bool>("isDead") == false;
@@ -328,6 +339,11 @@ namespace ReallifeGamemode.Server.Extensions
int nameTagColor = 0;
Player player = user.Player;
if(player == null || !player.IsLoggedIn())
{
return;
}
bool duty = user.GetData<bool>("duty");
if (player.GetData<bool>("SAdminduty"))
@@ -427,6 +443,7 @@ namespace ReallifeGamemode.Server.Extensions
return;
player.SyncAnimation("hup");
NAPI.Player.SetPlayerCurrentWeapon(player, WeaponHash.Unarmed);
if (player.GetUser().Wanteds > 0)
PositionManager.cuffPoints.Add(player);

111
ReallifeGamemode.Server/Extensions/VehicleExtension.cs
View File

@@ -17,5 +17,116 @@ namespace ReallifeGamemode.Server.Extensions
{
return NAPI.Pools.GetAllPlayers().Where(p => p.Vehicle != null && p.Vehicle?.Handle == veh.Handle && p.VehicleSeat == 0).FirstOrDefault();
}
//https://wiki.rage.mp/index.php?title=Vehicle_Classes
public static int GetVehicleTrunkSize(this Vehicle vehicle)
{
switch (vehicle.Class)
{
case 0:
return 100 * 1000;
case 1:
return 180 * 1000;
case 2:
return 400 * 1000;
case 3:
return 210 * 1000;
case 4:
if ((VehicleHash)vehicle.HashCode == VehicleHash.Moonbeam
|| (VehicleHash)vehicle.HashCode == VehicleHash.Moonbeam2
|| (VehicleHash)vehicle.HashCode == VehicleHash.Ratloader
|| (VehicleHash)vehicle.HashCode == VehicleHash.Ratloader2
|| (VehicleHash)vehicle.HashCode == VehicleHash.Slamvan
|| (VehicleHash)vehicle.HashCode == VehicleHash.Slamvan2
|| (VehicleHash)vehicle.HashCode == VehicleHash.Slamvan3
|| (VehicleHash)vehicle.HashCode == VehicleHash.Yosemite
|| (VehicleHash)vehicle.HashCode == VehicleHash.Yosemite2
|| (VehicleHash)vehicle.HashCode == VehicleHash.Picador
|| (VehicleHash)vehicle.HashCode == VehicleHash.Moonbeam)
return 250 * 1000;
else
return 180 * 1000;
case 5:
if ((VehicleHash)vehicle.HashCode == VehicleHash.Fagaloa
|| (VehicleHash)vehicle.HashCode == VehicleHash.Cheburek)
return 200 * 1000;
else
return 110 * 1000;
case 6:
return 120 * 1000;
case 7:
return 80 * 1000;
case 8:
return 5 * 1000;
case 9:
if ((VehicleHash)vehicle.HashCode == VehicleHash.Bifta
|| (VehicleHash)vehicle.HashCode == VehicleHash.Blazer
|| (VehicleHash)vehicle.HashCode == VehicleHash.Blazer2
|| (VehicleHash)vehicle.HashCode == VehicleHash.Blazer3
|| (VehicleHash)vehicle.HashCode == VehicleHash.Blazer4
|| (VehicleHash)vehicle.HashCode == VehicleHash.Blazer5)
return 30 * 1000;
else
return 300 * 1000;
case 10:
return 2500 * 1000;
case 11:
return 0;
case 12:
if ((VehicleHash)vehicle.HashCode == VehicleHash.Minivan
|| (VehicleHash)vehicle.HashCode == VehicleHash.Minivan2
|| (VehicleHash)vehicle.HashCode == VehicleHash.Bobcatxl)
return 600 * 1000;
else
return 1000 * 1000;
case 13:
return 0;
case 14:
return 50 * 1000;
case 15:
return 0;
case 16:
return 0;
case 17:
return 0;
case 18:
if ((VehicleHash)vehicle.HashCode == VehicleHash.Policet)
return 1000 * 1000;
else if ((VehicleHash)vehicle.HashCode == VehicleHash.Firetruk
|| (VehicleHash)vehicle.HashCode == VehicleHash.Pbus
|| (VehicleHash)vehicle.HashCode == VehicleHash.Policeb
|| (VehicleHash)vehicle.HashCode == VehicleHash.Polmav
|| (VehicleHash)vehicle.HashCode == VehicleHash.Predator)
return 0;
else
return 150 * 1000;
case 19:
return 0;
case 20:
return 2500 * 1000;
}
return 0;
}
}
}

8
ReallifeGamemode.Server/Factions/Medic/Medic.cs
View File

@@ -182,6 +182,12 @@ namespace ReallifeGamemode.Server.Factions.Medic
{
var medic = PlayerService.GetPlayerByNameOrId(task.MedicName);
var victim = PlayerService.GetPlayerByNameOrId(task.Victim);
if(medic == null || victim == null)
{
continue;
}
task.Position = victim.Position;
medic.TriggerEvent("updateHealCheckpoint", victim.Position.X, victim.Position.Y, victim.Position.Z);
}
@@ -257,7 +263,7 @@ namespace ReallifeGamemode.Server.Factions.Medic
{
player.SetData("healauftrag", false);
var medicPlayer = PlayerService.GetPlayerByNameOrId(task.MedicName);
if (task.MedicName != "none")
if (medicPlayer != null)
{
medicPlayer.TriggerEvent("destroyMedicTaskCheckpoint");
}

5
ReallifeGamemode.Server/Finance/Economy.cs
View File

@@ -189,6 +189,11 @@ namespace ReallifeGamemode.Server.Finance
using var dbContext = new DatabaseContext();
foreach (var player in NAPI.Pools.GetAllPlayers().Where(p => p.IsLoggedIn()))
{
if(player.IsAfk())
{
continue;
}
User user = player.GetUser(dbContext);
if(user == null)
{

2
ReallifeGamemode.Server/Gangwar/Turf.cs
View File

@@ -247,7 +247,7 @@ namespace ReallifeGamemode.Server.Gangwar
Player[] attackers = NAPI.Pools.GetAllPlayers().Where(c => c.IsLoggedIn() && c.GetUser().Faction?.Name == this.Attacker).ToArray();
Faction ownerFaction = dbContext.Factions.Include(f => f.BankAccount).Where(f => f.Name == getOwner()).FirstOrDefault();
Faction attackerFaction = dbContext.Factions.Include(f => f.BankAccount).Where(f => f.Name == getOwner()).FirstOrDefault();
Faction attackerFaction = dbContext.Factions.Include(f => f.BankAccount).Where(f => f.Name == getAttacker()).FirstOrDefault();
if (ownerFaction == null || attackerFaction == null)
{

4
ReallifeGamemode.Server/Inventory/Interfaces/IUsableItem.cs
View File

@@ -8,8 +8,8 @@
namespace ReallifeGamemode.Server.Inventory.Interfaces
{
public interface IUsableItem : IItem, IDroppableItem
public interface IUsableItem : IItem, IDroppableItem //marker Interface
{
void Use(UserItem uItem);
bool Use(UserItem uItem);
}
}

1
ReallifeGamemode.Server/Inventory/Items/Aal.cs
View File

@@ -13,7 +13,6 @@ namespace ReallifeGamemode.Server.Inventory.Items
public override string Description => "Ein Fisch";
public override int Gewicht => 3600;
public override string Einheit => "g";
public override int HpAmount => 20;
public override uint Object => 786272259;
public override int Price => 0;
}

28
ReallifeGamemode.Server/Inventory/Items/Apfel.cs
View File

@@ -1,18 +1,38 @@
using System;
using System.Collections.Generic;
using System.Text;
using GTANetworkAPI;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Managers;
namespace ReallifeGamemode.Server.Inventory.Items
{
class Apfel : FoodItem
internal class Apfel : ConsumableItem
{
public override int Id => 101;
public override string Name => "Apfel";
public override string Description => "Ein Apfel";
public override int Gewicht => 10;
public override string Description => "Ein Apfel.";
public override int Gewicht => 200;
public override string Einheit => "g";
public override int HpAmount => 10;
public override uint Object => 2240524752;
public override int Price => 20;
public override int Price => 200;
public override float Cooldown => 10000;
public override void Consume(UserItem uItem)
{
Player player = uItem.GetUser().Player;
int amountToAdd = HpAmount;
if (player.Health + amountToAdd > 100)
{
amountToAdd = 100 - player.Health;
}
player.SafeSetHealth(player.Health + amountToAdd);
player.SendNotification("Du hast einen ~y~" + Name + " ~s~gegessen.", false);
InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1);
}
}
}

17
ReallifeGamemode.Server/Inventory/Items/AssaultRifle.cs
View File

@@ -4,15 +4,14 @@ using System.Text;
namespace ReallifeGamemode.Server.Inventory.Items
{
class AssaultRifle : WeaponDealItem
internal class AssaultRifle : WeaponDealItem
{
public override int Id => 13;
public override string Name => "AssaultRifle";
public override string Description => "Waffe";
public override int Gewicht => 500;
public override string Einheit => "g";
public override uint Object => 3666746839; //3061944032
public override int Price => 0;
public override int Id => 13;
public override string Name => "AssaultRifle";
public override string Description => "Waffe";
public override int Gewicht => 4780;
public override string Einheit => "g";
public override uint Object => 3666746839; //3061944032
public override int Price => 0;
}
}

5
ReallifeGamemode.Server/Inventory/Items/AssaultSmg.cs
View File

@@ -4,15 +4,14 @@ using System.Text;
namespace ReallifeGamemode.Server.Inventory.Items
{
class AssaultSmg : WeaponDealItem
internal class AssaultSmg : WeaponDealItem
{
public override int Id => 14;
public override string Name => "AssaultSmg";
public override string Description => "Waffe";
public override int Gewicht => 500;
public override int Gewicht => 2300;
public override string Einheit => "g";
public override uint Object => 3666746839; //3061944032
public override int Price => 0;
}
}

29
ReallifeGamemode.Server/Inventory/Items/AviateChips.cs
View File

@@ -1,18 +1,39 @@
using System;
using System.Collections.Generic;
using System.Text;
using GTANetworkAPI;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Managers;
namespace ReallifeGamemode.Server.Inventory.Items
{
class AChips : FoodItem
internal class AviateChips : ConsumableItem
{
public override int Id => 104;
public override string Name => "Aviates Chips";
public override string Name => "aviates Chips";
public override string Description => "aviate liebt sie.";
public override int Gewicht => 10;
public override int Gewicht => 200;
public override string Einheit => "g";
public override int HpAmount => 10;
public override uint Object => 2240524752;
public override int Price => 20;
public override int Price => 1000;
public override float Cooldown => 5000;
public override void Consume(UserItem uItem)
{
Player player = uItem.GetUser().Player;
int amountToAdd = HpAmount;
if (player.Health + amountToAdd > 100)
{
amountToAdd = 100 - player.Health;
}
player.SafeSetHealth(player.Health + amountToAdd);
player.SendNotification("Du hast ~y~" + Name + " ~s~gegessen.", false);
InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1);
}
}
}

39
ReallifeGamemode.Server/Inventory/Items/Baklava.cs Normal file
View File

@@ -0,0 +1,39 @@
using System;
using System.Collections.Generic;
using System.Text;
using GTANetworkAPI;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Managers;
namespace ReallifeGamemode.Server.Inventory.Items
{
internal class Baklava : ConsumableItem
{
public override int Id => 105;
public override string Name => "Baklava";
public override string Description => "Dessert für dannach.";
public override int Gewicht => 100;
public override string Einheit => "g";
public override int HpAmount => 30;
public override uint Object => 2240524752;
public override int Price => 600;
public override float Cooldown => 20000;
public override void Consume(UserItem uItem)
{
Player player = uItem.GetUser().Player;
int amountToAdd = HpAmount;
if (player.Health + amountToAdd > 100)
{
amountToAdd = 100 - player.Health;
}
player.SafeSetHealth(player.Health + amountToAdd);
player.SendNotification("Du hast ein ~y~" + Name + " ~s~gegessen.", false);
InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1);
}
}
}

1
ReallifeGamemode.Server/Inventory/Items/Barsch.cs
View File

@@ -13,7 +13,6 @@ namespace ReallifeGamemode.Server.Inventory.Items
public override string Description => "Ein Fisch";
public override int Gewicht => 2600;
public override string Einheit => "g";
public override int HpAmount => 20;
public override uint Object => 786272259;
public override int Price => 0;
}

16
ReallifeGamemode.Server/Inventory/Items/Bier.cs
View File

@@ -1,18 +1,26 @@
using System;
using System.Collections.Generic;
using System.Text;
using ReallifeGamemode.Database.Entities;
namespace ReallifeGamemode.Server.Inventory.Items
{
class Bier : FoodItem
internal class Bier : ConsumableItem
{
public override int Id => 102;
public override string Name => "Bier";
public override string Description => "Ein Bier";
public override int Gewicht => 10;
public override string Description => "Ein Kolben";
public override int Gewicht => 500;
public override string Einheit => "g";
public override int HpAmount => 10;
public override uint Object => 2240524752;
public override int Price => 20;
public override int Price => 50;
public override float Cooldown => 1000;
public override void Consume(UserItem uItem)
{
//nothing
}
}
}

34
ReallifeGamemode.Server/Inventory/Items/Cannabis.cs
View File

@@ -1,4 +1,5 @@
using ReallifeGamemode.Server.Inventory.Interfaces;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Server.Inventory.Interfaces;
/**
* @overview Life of German Reallife - Inventory Items Hamburger (Hamburger.cs)
@@ -8,14 +9,29 @@
namespace ReallifeGamemode.Server.Inventory.Items
{
public class Cannabis : IDroppableItem
public class Cannabis : ConsumableItem
{
public int Id => 30;
public string Name => "Grünes Gift";
public string Description => "puff puff and pass";
public int Gewicht => 50;
public string Einheit => "g";
public uint Object => 3076948544;
public int Price => 0;
public override int Id => 108;
public override string Name => "Grünes Gift";
public override string Description => "puff puff and pass";
public override int Gewicht => 2;
public override string Einheit => "g";
public override uint Object => 3076948544;
public override int Price => 0;
public override int HpAmount => -5;
public override float Cooldown => 20000;
public override void Consume(UserItem uItem)
{
//nothing
}
}
}

2
ReallifeGamemode.Server/Inventory/Items/CarbineRifle.cs
View File

@@ -11,7 +11,7 @@ namespace ReallifeGamemode.Server.Inventory.Items
public override int Id => 6;
public override string Name => "CarbineRifle";
public override string Description => "Waffe";
public override int Gewicht => 500;
public override int Gewicht => 3200;
public override string Einheit => "g";
public override uint Object => 3666746839; //3061944032
public override int Price => 0;

31
ReallifeGamemode.Server/Inventory/Items/Cheeseburger.cs
View File

@@ -1,4 +1,9 @@
/**
using GTANetworkAPI;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Managers;
/**
* @overview Life of German Reallife - Inventory Items Cheeseburger (Cheeseburger.cs)
* @author VegaZ
* @copyright (c) 2008 - 2018 Life of German
@@ -6,15 +11,31 @@
namespace ReallifeGamemode.Server.Inventory.Items
{
public class Cheeseburger : FoodItem
public class Cheeseburger : ConsumableItem
{
public override int Id => 103;
public override string Name => "Cheeseburger";
public override string Description => "Ein Burger";
public override int Gewicht => 50;
public override string Description => "Extra käsig.";
public override int Gewicht => 120;
public override string Einheit => "g";
public override int HpAmount => 20;
public override uint Object => 2240524752;
public override int Price => 100;
public override int Price => 500;
public override float Cooldown => 7000;
public override void Consume(UserItem uItem)
{
Player player = uItem.GetUser().Player;
int amountToAdd = HpAmount;
if (player.Health + amountToAdd > 100)
{
amountToAdd = 100 - player.Health;
}
player.SafeSetHealth(player.Health + amountToAdd);
player.SendNotification("Du hast einen ~y~" + Name + " ~s~gegessen.", false);
InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1);
}
}
}

31
ReallifeGamemode.Server/Inventory/Items/Chips.cs
View File

@@ -1,18 +1,39 @@
using System;
using System.Collections.Generic;
using System.Text;
using GTANetworkAPI;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Managers;
namespace ReallifeGamemode.Server.Inventory.Items
{
class Chips : FoodItem
internal class Chips : ConsumableItem
{
public override int Id => 100;
public override string Name => "Chips";
public override string Description => "Eine tüte Chips";
public override int Gewicht => 10;
public override string Description => "80% Luft, 20% Verpackung.";
public override int Gewicht => 180;
public override string Einheit => "g";
public override int HpAmount => 10;
public override int HpAmount => 5;
public override uint Object => 2240524752;
public override int Price => 20;
public override int Price => 5;
public override float Cooldown => 5500;
public override void Consume(UserItem uItem)
{
Player player = uItem.GetUser().Player;
int amountToAdd = HpAmount;
if (player.Health + amountToAdd > 100)
{
amountToAdd = 100 - player.Health;
}
player.SafeSetHealth(player.Health + amountToAdd);
player.SendNotification("Du hast ~y~" + Name + " ~s~gegessen.", false);
InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1);
}
}
}

21
ReallifeGamemode.Server/Inventory/Items/Cocain.cs
View File

@@ -1,4 +1,6 @@
/**
using ReallifeGamemode.Database.Entities;
/**
* @overview Life of German Reallife - Inventory Items Chickenburger (Chickenburger.cs)
* @author VegaZ
* @copyright (c) 2008 - 2018 Life of German
@@ -6,15 +8,22 @@
namespace ReallifeGamemode.Server.Inventory.Items
{
public class Cocain : FoodItem
public class Cocain : ConsumableItem
{
public override int Id => 31;
public override string Name => "Kosks";
public override int Id => 107;
public override string Name => "Koks";
public override string Description => "Rave";
public override int Gewicht => 50;
public override int Gewicht => 2;
public override string Einheit => "g";
public override int HpAmount => 25;
public override int HpAmount => -5;
public override uint Object => 2240524752;
public override int Price => 0;
public override float Cooldown => 20000;
public override void Consume(UserItem uItem)
{
//nothing
}
}
}

17
ReallifeGamemode.Server/Inventory/Items/CombatPDW.cs
View File

@@ -4,15 +4,14 @@ using System.Text;
namespace ReallifeGamemode.Server.Inventory.Items
{
class CombatPDW : WeaponDealItem
internal class CombatPDW : WeaponDealItem
{
public override int Id => 12;
public override string Name => "CombatPDW";
public override string Description => "Waffe";
public override int Gewicht => 500;
public override string Einheit => "g";
public override uint Object => 3666746839; //3061944032
public override int Price => 0;
public override int Id => 12;
public override string Name => "CombatPDW";
public override string Description => "Waffe";
public override int Gewicht => 2300;
public override string Einheit => "g";
public override uint Object => 3666746839; //3061944032
public override int Price => 0;
}
}

4
ReallifeGamemode.Server/Inventory/Items/Combatpstiol.cs
View File

@@ -4,12 +4,12 @@ using System.Text;
namespace ReallifeGamemode.Server.Inventory.Items
{
class Combatpstiol : WeaponDealItem
internal class Combatpstiol : WeaponDealItem
{
public override int Id => 4;
public override string Name => "Combatpistol";
public override string Description => "Waffe";
public override int Gewicht => 500;
public override int Gewicht => 950;
public override string Einheit => "g";
public override uint Object => 3666746839; //3061944032
public override int Price => 0;

60
ReallifeGamemode.Server/Inventory/Items/ConsumableItem.cs Normal file
View File

@@ -0,0 +1,60 @@
using System;
using GTANetworkAPI;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Inventory.Interfaces;
using ReallifeGamemode.Server.Managers;
using ReallifeGamemode.Server.Util;
namespace ReallifeGamemode.Server.Inventory.Items
{
public abstract class ConsumableItem : IUsableItem
{
public abstract int HpAmount { get; }
public abstract int Id { get; }
public abstract string Name { get; }
public abstract string Description { get; }
public abstract int Gewicht { get; }
public abstract string Einheit { get; }
public abstract uint Object { get; }
public abstract int Price { get; }
public abstract float Cooldown { get; }
public abstract void Consume(UserItem uItem);
public bool Use(UserItem uItem)
{
User user = uItem.GetUser();
if (user.Player == null || !user.Player.IsLoggedIn())
return false;
if (InventoryManager.itemCooldown.ContainsKey(user.Player))
{
PlayerTimer timer = InventoryManager.itemCooldown[user.Player];
int timeToNextUse = (int)(timer.startTime - DateTime.Now).TotalSeconds;
uItem.GetUser().Player.TriggerEvent("Error", $"Versuche es nach {timeToNextUse} Sekunden erneut.");
return false;
}
PlayerTimer playerTimer = new PlayerTimer(user.Player, this, Cooldown);
playerTimer.Elapsed += _CooldownElapse;
InventoryManager.itemCooldown.Add(user.Player, playerTimer);
Consume(uItem);
return true;
}
private void _CooldownElapse(Player player, dynamic usableItem)
{
NAPI.Task.Run(() =>
{
if (player == null || !player.IsLoggedIn())
return;
if (!InventoryManager.itemCooldown.ContainsKey(player))
return;
InventoryManager.itemCooldown[player].Stop();
InventoryManager.itemCooldown.Remove(player);
});
}
}
}

1
ReallifeGamemode.Server/Inventory/Items/DropItem.cs
View File

@@ -8,7 +8,6 @@ namespace ReallifeGamemode.Server.Inventory.Items
{
public abstract class DropItem : IDroppableItem
{
public abstract int HpAmount { get; }
public abstract int Id { get; }
public abstract string Name { get; }
public abstract string Description { get; }

1
ReallifeGamemode.Server/Inventory/Items/Flunder.cs
View File

@@ -13,7 +13,6 @@ namespace ReallifeGamemode.Server.Inventory.Items
public override string Description => "Ein Fisch";
public override int Gewicht => 7700;
public override string Einheit => "g";
public override int HpAmount => 20;
public override uint Object => 786272259;
public override int Price => 0;
}

35
ReallifeGamemode.Server/Inventory/Items/FoodItem.cs
View File

@@ -1,35 +0,0 @@
using GTANetworkAPI;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Inventory.Interfaces;
using ReallifeGamemode.Server.Managers;
namespace ReallifeGamemode.Server.Inventory.Items
{
public abstract class FoodItem : IUsableItem
{
public abstract int HpAmount { get; }
public abstract int Id { get; }
public abstract string Name { get; }
public abstract string Description { get; }
public abstract int Gewicht { get; }
public abstract string Einheit { get; }
public abstract uint Object { get; }
public abstract int Price { get; }
public void Use(UserItem uItem)
{
Player player = uItem.GetUser().Player;
int amountToAdd = HpAmount;
if (player.Health + amountToAdd > 100)
{
amountToAdd = 100 - player.Health;
}
player.SafeSetHealth(player.Health + amountToAdd);
player.SendNotification("Du hast ein/einen ~y~" + InventoryManager.GetItemById(uItem.ItemId).Name + " ~s~gegessen.", false);
InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1);
}
}
}

20
ReallifeGamemode.Server/Inventory/Items/Holz.cs
View File

@@ -8,14 +8,18 @@
namespace ReallifeGamemode.Server.Inventory.Items
{
public class Holz : IDroppableItem
public class Holz : DropItem
{
public int Id => 32;
public string Name => "Holz";
public string Description => "Ich und mein Holz.";
public int Gewicht => 650;
public string Einheit => "g";
public uint Object => 1805779401;
public int Price => 0;
public override int Id => 20;
public override string Name => "Holz";
public override string Description => "Ich und mein Holz.";
public override int Gewicht => 650;
public override string Einheit => "g";
public override uint Object => 1805779401;
public override int Price => 0;
}
}

39
ReallifeGamemode.Server/Inventory/Items/Kebab.cs Normal file
View File

@@ -0,0 +1,39 @@
using System;
using System.Collections.Generic;
using System.Text;
using GTANetworkAPI;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Managers;
namespace ReallifeGamemode.Server.Inventory.Items
{
internal class Kebab : ConsumableItem
{
public override int Id => 106;
public override string Name => "Döner";
public override string Description => "Von Emre selbst gemacht.";
public override int Gewicht => 500;
public override string Einheit => "g";
public override int HpAmount => 80;
public override uint Object => 2240524752;
public override int Price => 1800;
public override float Cooldown => 50000;
public override void Consume(UserItem uItem)
{
Player player = uItem.GetUser().Player;
int amountToAdd = HpAmount;
if (player.Health + amountToAdd > 100)
{
amountToAdd = 100 - player.Health;
}
player.SafeSetHealth(player.Health + amountToAdd);
player.SendNotification("Du hast ein ~y~" + Name + " ~s~gegessen.", false);
InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1);
}
}
}

1
ReallifeGamemode.Server/Inventory/Items/Lachs.cs
View File

@@ -13,7 +13,6 @@ namespace ReallifeGamemode.Server.Inventory.Items
public override string Description => "Du Lachs";
public override int Gewicht => 4200;
public override string Einheit => "g";
public override int HpAmount => 20;
public override uint Object => 786272259;
public override int Price => 0;
}

2
ReallifeGamemode.Server/Inventory/Items/Rubellos.cs
View File

@@ -8,6 +8,6 @@
public override int Gewicht => 10;
public override string Einheit => "g";
public override uint Object => 875075437;
public override int Price => 0;
public override int Price => 500;
}
}

1
ReallifeGamemode.Server/Inventory/Items/Thunfisch.cs
View File

@@ -13,7 +13,6 @@ namespace ReallifeGamemode.Server.Inventory.Items
public override string Description => "Ein Fisch";
public override int Gewicht => 11000;
public override string Einheit => "g";
public override int HpAmount => 20;
public override uint Object => 786272259;
public override int Price => 0;
}

5
ReallifeGamemode.Server/Inventory/Items/UseItem.cs
View File

@@ -20,13 +20,13 @@ namespace ReallifeGamemode.Server.Inventory.Items
public abstract uint Object { get; }
public abstract int Price { get; }
public void Use(UserItem uItem)
public bool Use(UserItem uItem)
{
Player player = uItem.GetUser().Player;
if (uItem.ItemId != 200)
{
return;
return false;
}
Random random = new Random();
int randomNumber = random.Next(1, 5);
@@ -47,6 +47,7 @@ namespace ReallifeGamemode.Server.Inventory.Items
}
player.SendNotification("Du hast ~g~" + InventoryManager.GetItemById(uItem.ItemId).Name + " ~s~verwendet.", false);
InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1);
return true;
}
}
}

1
ReallifeGamemode.Server/Inventory/Items/Zander.cs
View File

@@ -13,7 +13,6 @@ namespace ReallifeGamemode.Server.Inventory.Items
public override string Description => "Ein Fisch";
public override int Gewicht => 5000;
public override string Einheit => "g";
public override int HpAmount => 20;
public override uint Object => 786272259;
public override int Price => 0;
}

29
ReallifeGamemode.Server/Job/BusDriverJob.cs
View File

@@ -33,9 +33,9 @@ namespace ReallifeGamemode.Server.Job
public const uint VEHICLE_INTERMEDIATE = (uint)VehicleHash.Coach;
public const uint VEHICLE_PROFESSIONAL = (uint)VehicleHash.Tourbus;
public const int WAGE_BEGINNER = 800;
public const int WAGE_INTERMEDIATE = 1200;
public const int WAGE_PROFESSIOAL = 1800;
public const int WAGE_BEGINNER = 400;
public const int WAGE_INTERMEDIATE = 600;
public const int WAGE_PROFESSIOAL = 900;
public const string BEGINNER = "Anfänger";
public const string INTERMEDIATE = "Fortgeschrittener";
@@ -345,8 +345,7 @@ namespace ReallifeGamemode.Server.Job
if (type == PROFESSIONAL && user.BusSkill < SKILL_PROFESSIONAL) { player.TriggerEvent("MenuSelect:Error"); return; }
List<Vector3> selectedRoute = new List<Vector3>();
int index = -1;
int index;
if (playerRouteCurrent.ContainsKey(player.Name))
{
index = getPlayerRouteInex(player);
@@ -444,6 +443,14 @@ namespace ReallifeGamemode.Server.Job
player.SendChatMessage("~y~[JOB]: ~w~Die neue Route lädt. Bitte warten...");
string type = getPlayerRouteType(player);
if (type == BEGINNER)
BusJobEvents.payWage(player, WAGE_BEGINNER);
else if (type == INTERMEDIATE)
BusJobEvents.payWage(player, WAGE_INTERMEDIATE);
else if (type == PROFESSIONAL)
BusJobEvents.payWage(player, WAGE_PROFESSIOAL);
NAPI.Task.Run(() =>
{
if (type == BEGINNER)
@@ -467,6 +474,7 @@ namespace ReallifeGamemode.Server.Job
NAPI.ClientEvent.TriggerClientEventForAll("SERVER:setIndicatorStatus", veh.Handle.Value, data.Left, data.Right);
}
public void BusCheckpoint(Player player)
{
if (!player.IsInVehicle || player.VehicleSeat != 0) return;
@@ -565,6 +573,11 @@ namespace ReallifeGamemode.Server.Job
return;
}
if(!playerVehiclePair.ContainsKey(player))
{
return;
}
if (JobManager.playerTimersJobVehicleRespawn.ContainsKey(player))
{
JobManager.playerTimersJobVehicleRespawn[player].Stop();
@@ -582,7 +595,7 @@ namespace ReallifeGamemode.Server.Job
player.SendChatMessage("~y~[JOB] ~w~Bist du nicht in 30 Sekunden zurück, ~r~wird der Job beendet!");
}
private void JobTimerElapsed(Player player, Vehicle vehicle)
private void JobTimerElapsed(Player player, dynamic vehicle)
{
NAPI.Task.Run(() =>
{
@@ -620,7 +633,7 @@ namespace ReallifeGamemode.Server.Job
payWage(player, BusDriverJob.WAGE_PROFESSIOAL / BusDriverJob.playerRouteCurrent[player.Name].Count);
}
private void payWage(Player player, int wage)
public static void payWage(Player player, int wage)
{
using var dbContext = new DatabaseContext();
User user = player.GetUser(dbContext);
@@ -640,8 +653,6 @@ namespace ReallifeGamemode.Server.Job
player.SendChatMessage($"~y~[JOB]: ~w~Du kannst jetzt auch mit dem Tourbus fahren!");
}
BusDriverJob job = JobManager.GetJob<BusDriverJob>();
dbContext.SaveChanges();
}
}

2
ReallifeGamemode.Server/Job/MuellmannData.cs
View File

@@ -32,7 +32,7 @@ namespace ReallifeGamemode.Server.Job
public void removeClientFromData(Player player)
{
if (client1 == player) { client1 = null; }
if (client2 == player) { client2 = null;}
if (client2 == player) { client2 = null; }
}
public int getTrashCount()

3
ReallifeGamemode.Server/Job/PilotJob.cs
View File

@@ -292,7 +292,6 @@ namespace ReallifeGamemode.Server.Job
_CHANGING_VEHICLE.Remove(player);
return;
}
if (JobManager.playerTimersJobVehicleRespawn.ContainsKey(player))
{
@@ -310,7 +309,7 @@ namespace ReallifeGamemode.Server.Job
player.SendChatMessage("~y~[JOB] ~w~Bist du nicht in 30 Sekunden zurück, ~r~wird der Job beendet!");
}
private void JobTimerElapsed(Player player, Vehicle vehicle)
private void JobTimerElapsed(Player player, dynamic vehicle)
{
NAPI.Task.Run(() =>
{

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

@@ -180,7 +180,11 @@ namespace ReallifeGamemode.Server.Job
public void MuellmannJobBeenden(Player player)
{
JobBase job = JobManager.GetJob(player.GetUser().JobId ?? -1);
if (player == null || !player.IsLoggedIn())
{
return;
}
player.TriggerEvent("SERVER:MuellmannStatusFalse");
player.TriggerEvent("SERVER:MuellmannBCSEntfernen");
@@ -436,7 +440,7 @@ namespace ReallifeGamemode.Server.Job
JobManager.playerTimersJobVehicleRespawn[player] = playerTimer;
}
private void JobTimerElapsed(Player player, Vehicle vehicle)
private void JobTimerElapsed(Player player, dynamic vehicle)
{
NAPI.Task.Run(() =>
{

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

@@ -58,7 +58,7 @@ namespace ReallifeGamemode.Server.Managers
FactionHelper.ResetPlayer(player, own, dbContext);
own.Faction = u.Faction;
own.FactionId = u.FactionId;
own.FactionLeader = false;
own.FactionRank = dbContext
.FactionRanks
@@ -260,13 +260,13 @@ namespace ReallifeGamemode.Server.Managers
UpdateCharacterCloth.LoadCharacterDefaults(targetPlayer);
ChatService.SendMessage(targetPlayer, "!{02FCFF}Du wurdest von " + player.Name + " aus der Fraktion geworfen.");
FactionHelper.ResetPlayer(targetPlayer, targetUser, dbContext);
}
}
Medic.UpdateDutyMedics();
targetUser.FactionRankId = null;
targetUser.FactionId = null;
targetUser.SetBlipAndNametagColor();
ChatService.SendMessage(player, "!{02FCFF}Du hast " + targetUser.Name + " aus der Fraktion geworfen.");
ChatService.SendMessage(player, "!{02FCFF}Du hast " + targetUser.Name + " aus der Fraktion geworfen.");
dbContext.SaveChanges();
}
@@ -449,7 +449,7 @@ namespace ReallifeGamemode.Server.Managers
[RemoteEvent("CLIENT:InteractionMenu_PlayerVehicleInteraction")]
public void PlayerVehicleInteraction(Player player, int id, string selection)
{
using var dbContext = new DatabaseContext(true);
using var dbContext = new DatabaseContext();
var user = player.GetUser(dbContext);
var userVehicle = dbContext.UserVehicles.Where(v => v.Id == id && v.UserId == user.Id).FirstOrDefault();
@@ -467,7 +467,7 @@ namespace ReallifeGamemode.Server.Managers
else if (selection == "Verkaufen")
{
var vehPrice = userVehicle.Price;
var backPrice = (int)(vehPrice * 0.6);
var backPrice = (int)(vehPrice * 0.4);
user.BankAccount.Balance += backPrice;
@@ -483,9 +483,14 @@ namespace ReallifeGamemode.Server.Managers
[RemoteEvent("CLIENT:InteractionMenu_FactionVehicleInteraction")]
public void FactionVehicleInteraction(Player player, int id, string selection)
{
using var dbContext = new DatabaseContext(true);
using var dbContext = new DatabaseContext();
var user = player.GetUser(dbContext);
if (user.FactionId == null)
{
return;
}
var factionVehicle = dbContext.FactionVehicles.ToList().Where(v => v.Id == id && v.GetOwners().Contains(user.FactionId.Value)).FirstOrDefault();
if (factionVehicle == null)
{
@@ -498,46 +503,42 @@ namespace ReallifeGamemode.Server.Managers
{
player.TriggerEvent("SERVER:Util_setWaypoint", veh.Position.X, veh.Position.Y);
}
}
[RemoteEvent("CLIENT:InteractionMenu_FactionVehicleInteractionSell")]
public void FactionVehicleInteractionSell(Player player, int id, string selection)
{
using var dbContext = new DatabaseContext(true);
var user = player.GetUser(dbContext);
var factionVehicle = dbContext.FactionVehicles.ToList().Where(v => v.Id == id && v.GetOwners().Contains(user.FactionId.Value)).FirstOrDefault();
if (factionVehicle == null)
else if (selection == "Verkaufen")
{
ChatService.ErrorMessage(player, "Das Fahrzeug wurde nicht gefunden");
}
GTANetworkAPI.Vehicle veh = VehicleManager.GetVehicleFromServerVehicle(factionVehicle);
if (selection == "Verkaufen")
{
if (dbContext.FactionVehicles.ToList().Where(f => f.GetOwners().Contains(user.FactionId.Value)).Count() <= 6)
if (!user.FactionLeader)
{
ChatService.ErrorMessage(player, "Die Fraktion muss mindestens 6 Fahrzeuge besitzen");
return;
}
if (factionVehicle.Model == VehicleHash.Policet || factionVehicle.Model == VehicleHash.Burrito3)
if (user.Faction.StateOwned)
{
ChatService.ErrorMessage(player, "Der WT kann nicht verkauft werden");
ChatService.ErrorMessage(player, "Der Fuhrpark der Staatsfraktionen kann über die Leaderverwaltung geändert werden");
return;
}
var backPrice = factionVehicle.BuyPrice;
var factionVehicleCount = dbContext.FactionVehicles.ToList().Where(v => v.Id == id && v.GetOwners().Contains(user.FactionId.Value)).Count();
if (factionVehicleCount <= 6)
{
ChatService.ErrorMessage(player, "Die Fraktion braucht mindestens 6 Fahrzeuge");
return;
}
var price = dbContext.ShopVehicles.Where(v => v.Model == factionVehicle.Model && v.Active).Select(s => new { s.Price }).FirstOrDefault();
if (price == null)
{
ChatService.ErrorMessage(player, "Das Fahrzeug konnte nicht verkauft werden. Bitte melde dich bei der Leaderverwaltung");
return;
}
var backPrice = (int)(price.Price * 1.5 * 0.4);
user.Faction.BankAccount.Balance += backPrice;
ChatService.SendMessage(player, $"~b~[INFO]~s~ Deine Fraktion hat durch den Autoverkauf ~g~{backPrice.ToMoneyString()}~s~ erhalten.");
ChatService.SendMessage(player, $"~b~[INFO]~s~ Die Fraktionskasse ~g~{backPrice.ToMoneyString()}~s~ erhalten.");
dbContext.FactionVehicles.Remove(factionVehicle);
dbContext.SaveChanges();
veh.Delete();
veh?.Delete();
}
}
@@ -588,86 +589,77 @@ namespace ReallifeGamemode.Server.Managers
public void InteractionMenu_LSPD_Points3(Player player, string jsonNameOrId, string jsoAmount, string jsonReason)
{
string nameOrId = (string)JsonConvert.DeserializeObject(jsonNameOrId);
int amount = Int32.Parse((string)JsonConvert.DeserializeObject(jsoAmount));
string reason = (string)JsonConvert.DeserializeObject(jsonReason);
Player target = PlayerService.GetPlayerByNameOrId(nameOrId);
string playername = NAPI.Player.GetPlayerName(player);
string targetname = NAPI.Player.GetPlayerName(target);
if (!int.TryParse((string)JsonConvert.DeserializeObject(jsoAmount), out int amount))
{
player.SendNotification("~r~Es muss eine gültige Zahl für die Punkte angegeben werden!");
return;
}
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
return;
}
else if (target.GetUser().DriverLicenseVehicle == false && target.GetUser().DriverLicenseBike == false)
{
player.SendNotification("~r~Spieler hat weder Auto- noch Motorradführerschein!");
}
else if (target == player)
if (target == player)
{
player.SendNotification("~r~Du kannst dir selbst keine Punkte setzen!");
return;
}
using var dbContext = new DatabaseContext();
User targetUser = target.GetUser(dbContext);
if(targetUser == null)
{
ChatService.PlayerNotFound(player);
return;
}
if (targetUser.DriverLicenseVehicle == false && targetUser.DriverLicenseBike == false)
{
player.SendNotification("~r~Spieler hat weder Auto- noch Motorradführerschein!");
return;
}
if (amount < -13 || amount > 13)
{
player.SendNotification("~r~Du kannst nur zwischen 1 und 12 Punkte verteilen!");
return;
}
targetUser.Points += amount;
player.SendNotification($"~w~Du hast ~y~{targetname} ~b~{amount} ~w~Strafpunkte gegeben. Grund: ~g~{reason}~w~.");
target.SendNotification($"~b~{player.GetUser().FactionRank.RankName} | {playername} ~w~hat dir ~y~{amount} ~w~Strafpunkte gegeben.", true);
ChatService.HQMessage(targetname + " hat von " + playername + " " + amount + " Strafpunkt(e) erhalten. Gesamt: " + targetUser.Points);
if (targetUser.Points < 0)
{
targetUser.Points = 0;
}
else if (targetUser.Points >= 12)
{
target.SendNotification($"~w~Grund: ~g~{reason}~w~. ~x~Du hast nun ~r~12/12 ~x~Strafpunkten.", true);
target.SendNotification($"~w~Dir wird ~r~Auto- ~w~und ~r~Motorradführerschein ~w~entzogen.", true); //FlashNotif
ChatService.HQMessage(targetname + " besitzt nun keinen Führerschein mehr.");
targetUser.Points = 0;
targetUser.DriverLicenseVehicle = false;
targetUser.DriverLicenseBike = false;
}
else
{
if (amount > -13 && amount < 13)
{
using (var dbContext = new DatabaseContext())
{
User target2 = target.GetUser(dbContext);
target2.Points += amount;
dbContext.SaveChanges();
}
player.SendNotification($"~w~Du hast ~y~{targetname} ~b~{amount} ~w~Strafpunkte gegeben. Grund: ~g~{reason}~w~.");
target.SendNotification($"~b~{player.GetUser().FactionRank.RankName} | {playername} ~w~hat dir ~y~{amount} ~w~Strafpunkte gegeben.", true);
ChatService.BroadcastFaction("!{#8181E9}HQ: " + targetname + " hat von " + playername + " " + amount + " Strafpunkt(e) erhalten. Gesamt: " + target.GetUser().Points, new List<int>() { 1, 3 });
if (target.GetUser().Points < 0)
{
using (var dbContext = new DatabaseContext())
{
User target2 = target.GetUser(dbContext);
target2.Points = 0;
dbContext.SaveChanges();
}
}
else if (target.GetUser().Points >= 12)
{
target.SendNotification($"~w~Grund: ~g~{reason}~w~. ~x~Du hast nun ~r~12/12 ~x~Strafpunkten.", true);
target.SendNotification($"~w~Dir wird ~r~Auto- ~w~und ~r~Motorradführerschein ~w~entzogen.", true); //FlashNotif
ChatService.HQMessage(targetname + "hat von" + playername + " " + amount + " Strafpunkt erhalten(e). Gesamt: " + target.GetUser().Points);
foreach (var copPlayer in NAPI.Pools.GetAllPlayers())
{
User copUser = copPlayer.GetUser();
if (copUser == null)
{
continue;
}
if (copUser.FactionId == 1 || copUser.FactionId == 3)
{
if (copUser.GetData<bool>("duty") == true)
{
ChatService.HQMessage(targetname + " besitzt nun keinen Führerschein mehr.");
}
}
}
using (var dbContext = new DatabaseContext())
{
User target2 = target.GetUser(dbContext);
target2.Points = 0;
target2.DriverLicenseVehicle = false;
target2.DriverLicenseBike = false;
dbContext.SaveChanges();
}
}
else
{
target.SendNotification($"~w~Grund: ~g~{reason}~w~. ~x~Du hast nun ~y~{target.GetUser().Points}/12 ~x~Strafpunkten.", true);
}
}
else
{
player.SendNotification("~r~Du kannst nur zwischen 1 und 12 Punkte verteilen!");
}
target.SendNotification($"~w~Grund: ~g~{reason}~w~. ~x~Du hast nun ~y~{targetUser.Points}/12 ~x~Strafpunkten.", true);
}
dbContext.SaveChanges();
}
[RemoteEvent("CLIENT:InteractionMenu_Ticket")]

26
ReallifeGamemode.Server/Managers/InventoryManager.cs
View File

@@ -15,7 +15,6 @@ using ReallifeGamemode.Server.Util;
using ReallifeGamemode.Services;
using ReallifeGamemode.Server.Types;
/**
* @overview Life of German Reallife - Managers InventoryManager (InventoryManager.cs)
* @author hydrant, VegaZ, balbo
@@ -34,7 +33,9 @@ namespace ReallifeGamemode.Server.Managers
public static Dictionary<Player, List<InventoryItem>> backpackItems { get; set; } = new Dictionary<Player, List<InventoryItem>>();
public static Dictionary<Player, List<InventoryItem>> vehicleItems { get; set; } = new Dictionary<Player, List<InventoryItem>>();
private static Timer aTimer;
public static Dictionary<Player, PlayerTimer> itemCooldown = new Dictionary<Player, PlayerTimer>();
public class InventoryItem
{
public string Name;
@@ -87,14 +88,13 @@ namespace ReallifeGamemode.Server.Managers
{
ServerVehicle carlocked = veh.GetServerVehicle(dbContext);
if (carlocked.Locked == true)
if (carlocked == null || carlocked.Locked == true)
{
player.TriggerEvent("Error", "Das Fahrzeug ist abgeschlossen!");
return;
}
}
List<VehicleItem> itemList = GetVehicleItems(veh);
if (itemList == null)
@@ -121,7 +121,7 @@ namespace ReallifeGamemode.Server.Managers
};
vehicleItems[player].Add(newItem);
}
player.SetSharedData("setVehicleTrunk", veh.GetVehicleTrunkSize());
player.SetSharedData("vehicleItems", JsonConvert.SerializeObject(vehicleItems[player].ToArray()));
}
@@ -365,7 +365,7 @@ namespace ReallifeGamemode.Server.Managers
RemoveUserItem(user, item, itemAmount);
AddItemToVehicleInventory(veh, itemID, itemAmount);
SetVehicleItems(player);
SetBackpackItems(player);
VehicleItem vehicleItem = context.VehicleItems.Where(f => f.ItemId == itemID && f.Vehicle == VehicleManager.GetServerVehicleFromVehicle(veh, context)).FirstOrDefault();
context.SaveChanges();
IItem iItem = GetItemById(itemID);
@@ -426,7 +426,7 @@ namespace ReallifeGamemode.Server.Managers
int setAmount = 0;
for (int i = 1; i <= amount; i++)
{
if (GetVehicleInventoryWeight(veh) + (i * GetItemById(itemId).Gewicht) > 200000)
if (GetVehicleInventoryWeight(veh) + (i * GetItemById(itemId).Gewicht) > veh.GetVehicleTrunkSize())
{
break;
}
@@ -517,7 +517,7 @@ namespace ReallifeGamemode.Server.Managers
case "use":
if (iItem == null)
{
player.TriggerEvent("Error", "Dieses Essen existiert nicht.");
player.TriggerEvent("Error", "Dieses Item existiert nicht.");
return;
}
@@ -529,10 +529,12 @@ namespace ReallifeGamemode.Server.Managers
if (iItem is IUsableItem usableItemObj)
{
usableItemObj.Use(fItem);
List<InventoryItem> items = backpackItems[player];
player.SetSharedData("backpackItems", JsonConvert.SerializeObject(items.ToArray()));
player.TriggerEvent("aproveUse", 1, iItem.Name);
if (usableItemObj.Use(fItem))
{
List<InventoryItem> items = backpackItems[player];
player.SetSharedData("backpackItems", JsonConvert.SerializeObject(items.ToArray()));
player.TriggerEvent("aproveUse", 1, iItem.Name);
}
}
else player.TriggerEvent("Error", "Du kannst dieses Item nicht benutzen.");
break;

70
ReallifeGamemode.Server/Managers/JobManager.cs
View File

@@ -155,7 +155,6 @@ namespace ReallifeGamemode.Server.Managers
[ServerEvent(Event.PlayerExitVehicle)]
public void JobManagerPlayerExitVehicle(Player player, Vehicle veh)
{
ServerVehicle sVeh = VehicleManager.GetServerVehicleFromVehicle(veh);
User u = player.GetUser();
if (u.JobId == null) return;
@@ -168,75 +167,6 @@ namespace ReallifeGamemode.Server.Managers
job.StartJobEndTimer(player);
}
public void PlayerTimer_Elapsed(Player player, Vehicle veh)
{
NAPI.Task.Run(() =>
{
//Vehicle LastVehicle = player.GetData<Vehicle>("LastVehicle");
Vehicle LastVehicle = veh;
JobBase job = GetJob(player?.GetUser()?.JobId ?? -1);
if (LastVehicle == null || job == null)
{
return;
}
if (LastVehicle.GetServerVehicle() is JobVehicle vehJ)
{
if (LastVehicle.GetData<bool>("timerJobVehicleRespawn") == true)
{
if (vehJ.GetJob().GetUsersInJob().Contains(player))
{
if (LastVehicle != null)
{
if (job.Id != 2) //Müllman Handelt Fahrzeug respawn eigenständig
{
LastVehicle.ResetData("timerJobVehicleRespawn");
ServerVehicle sVeh = VehicleManager.GetServerVehicleFromVehicle(LastVehicle);
ServerVehicleExtensions.Spawn(sVeh, LastVehicle);
}
job.StopJob(player);
ChatService.SendMessage(player, $"~y~[JOB]~s~ Du hast deinen Job ~o~{job.Name}~s~ beendet.");
CheckPointHandle.DeleteCheckpoints(player);
if (!player.HasData("isDead") || player.GetData<bool>("isDead") == false)
{
if (player.GetUser().JobId == 1)//Taxifahrer
{
player.TriggerEvent("CLIENT:stopFare");
player.SafeTeleport(new Vector3(-628.598388671875, -2107.609130859375, 6.072586536407471));
player.Heading = (-171.50303649902344f);
}
if (player.GetUser().JobId == 2)//Müllmann
{
player.SafeTeleport(new Vector3(485.4114685058594, -2173.25, 5.918273448944092));
player.Heading = (-15.922085762023926f);
}
if (player.GetUser().JobId == 3)//Pilot
{
if (!player.HasData("PilotenBase") || player.GetData<int>("PilotenBase") == 1) //Sandyshores
{
player.SafeTeleport(new Vector3(1707.2711181640625, 3276.216064453125, 41.155494689941406));
player.Heading = (-154.65234375f);
}
if (player.HasData("PilotenBase") && player.GetData<int>("PilotenBase") == 2) //LS Airport
{
player.SafeTeleport(new Vector3(-1622.48, -3151.58, 13));
player.Heading = (48.44f);
}
}
if (player.GetUser().JobId == 4)//Busfahrer
{
player.SafeTeleport(new Vector3(-535.46, -2144.97, 5.95));
player.Heading = (57.03f);
}
}
}
}
}
}
});
}
[RemoteEvent("CLIENT:Job_StopJob")]
public void StopJob(Player player)
{

24
ReallifeGamemode.Server/Managers/VehicleManager.cs
View File

@@ -9,15 +9,14 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using System.Timers;
using System.Threading.Tasks;
namespace ReallifeGamemode.Server.Managers
{
public class VehicleManager : Script
{
public static Dictionary<Vehicle, Dictionary<string, DateTime>> lastDriversInVehicle = new Dictionary<Vehicle, Dictionary<string, DateTime>>();
private static readonly List<string> _enabledMods = new List<string>()
{
"ninef",
@@ -758,6 +757,19 @@ namespace ReallifeGamemode.Server.Managers
"winky",
"polamggtr", //mod
"newsfrog", //mod
"fibn",//mod
"fibg",//mod
"fibd",//mod
"fibs",//mod
"fibc",//mod
"fibn2",//mod
"fibx",//mod
"fibg2",//mod
"fibd2",//mod
"fibj",//mod
"fibn3",//mod
"fibr"//mod
};
private static readonly Dictionary<int, NetHandle> _serverVehicles = new Dictionary<int, NetHandle>();
@@ -811,7 +823,6 @@ namespace ReallifeGamemode.Server.Managers
v.SetSharedData("drivenDistance", (float)distanceDriven);
});
if (DateTime.UtcNow.Subtract(lastSave).Seconds >= 30)
{
lastSave = DateTime.UtcNow;
@@ -835,7 +846,7 @@ namespace ReallifeGamemode.Server.Managers
}
});
}
public static void AddVehicle(ServerVehicle serverVehicle, Vehicle vehicle)
{
if (_serverVehicles.ContainsKey(serverVehicle.Id))
@@ -902,7 +913,6 @@ namespace ReallifeGamemode.Server.Managers
foreach (KeyValuePair<int, NetHandle> pair in _serverVehicles)
{
if (pair.Value == veh.Handle)
{
return dbContext.ServerVehicles.Find(pair.Key);

5
ReallifeGamemode.Server/Report/Report.cs
View File

@@ -24,7 +24,7 @@ namespace ReallifeGamemode.Server.Report
//ChatService.BroadcastAdmin("Eingehendes Ticket von " + client.Name + ": " + message + " (Benutze /showtickets)", AdminLevel.ADMIN);
}
[Command("showtickets", "~m~Benutzung: ~s~/showtickets")]
[Command("showtickets", "~m~Benutzung: ~s~/showtickets", Alias = "st")]
public void CmdAdminShowtickets(Player client)
{
if (!client.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true)
@@ -33,11 +33,12 @@ namespace ReallifeGamemode.Server.Report
return;
}
if (listReports.Count == 0)
if (listReports.FindAll(e => (e.isAssigned() == false)).Count == 0)
{
ChatService.ErrorMessage(client, "Im Moment gibt es keine Tickets.");
return;
}
User user = client.GetUser();
List<string> listPlayers = new List<string>();
List<string> listTicketnames = new List<string>();

6
ReallifeGamemode.Server/Services/ChatService.cs
View File

@@ -108,12 +108,14 @@ namespace ReallifeGamemode.Server.Services
}
}
string toSend = message;
if(getAddInfoMessage != null)
{
message += getAddInfoMessage(p);
toSend += getAddInfoMessage(p);
}
ChatService.SendMessage(p, message);
ChatService.SendMessage(p, toSend);
}
});
}

22
ReallifeGamemode.Server/Util/PlayerTimer.cs
View File

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Text;
using System.Timers;
using GTANetworkAPI;
using ReallifeGamemode.Server.Inventory.Interfaces;
namespace ReallifeGamemode.Server.Util
{
@@ -10,9 +11,12 @@ namespace ReallifeGamemode.Server.Util
{
private readonly Player player;
private readonly Vehicle veh;
private readonly IUsableItem usableItem;
private readonly Timer timer;
public readonly DateTime startTime;
public delegate void PlayerTimerElapsed(Player player, dynamic dynamic);
public delegate void PlayerTimerElapsed(Player player, Vehicle veh);
public event PlayerTimerElapsed Elapsed;
public PlayerTimer(Player player, Vehicle veh = null, int milliseconds = 1000)
@@ -25,9 +29,23 @@ namespace ReallifeGamemode.Server.Util
this.timer.Start();
}
public PlayerTimer(Player player, IUsableItem usableItem, float milliseconds = 1000)
{
this.player = player;
this.usableItem = usableItem;
this.startTime = DateTime.Now.AddMilliseconds(milliseconds);
this.timer = new Timer(milliseconds);
this.timer.Elapsed += Timer_Elapsed;
this.timer.Start();
}
private void Timer_Elapsed(object sender, ElapsedEventArgs e)
{
Elapsed?.Invoke(player, veh);
if (veh != null)
Elapsed?.Invoke(player, veh);
else
Elapsed?.Invoke(player, usableItem);
}
public void Stop()

18
ReallifeGamemode.Server/Wanted/WantedEscapeTimer.cs
View File

@@ -27,12 +27,8 @@ namespace ReallifeGamemode.Server.Wanted
}
*/
public static void ResetWantedTimeToElapse(Player client)
public static void ResetWantedTimeToElapse(User user)
{
User user = client.GetUser();
if (user.FactionId == 1 || user.FactionId == 3)
return;
waTimer[user.Id] = WantedEscapeTime;
}
@@ -45,7 +41,7 @@ namespace ReallifeGamemode.Server.Wanted
if (user != null && user.Wanteds > 0)
{
if (!waTimer.ContainsKey(user.Id))
ResetWantedTimeToElapse(player);
ResetWantedTimeToElapse(user);
bool isNearCop = false;
foreach (var playerCop in NAPI.Pools.GetAllPlayers())
@@ -70,7 +66,7 @@ namespace ReallifeGamemode.Server.Wanted
if (waTimer[user.Id] <= 0)
{
ResetWantedTimeToElapse(player);
ResetWantedTimeToElapse(user);
player.SendChatMessage("~y~Du hast erfolgreich einen Wanted abgetaucht.");
user.Wanteds -= 1;
if (user.Wanteds == 0)
@@ -82,7 +78,15 @@ namespace ReallifeGamemode.Server.Wanted
waTimer[user.Id] = WantedEscapeTime;
}
else if (!isNearCop)
{
player.TriggerEvent("SERVER:SetWantedFlash", true);
waTimer[user.Id] -= 2500;
}
else if (isNearCop)
{
player.TriggerEvent("SERVER:SetWantedFlash", false);
ResetWantedTimeToElapse(user);
}
}
}
}

21
ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs
View File

@@ -17,16 +17,24 @@ namespace ReallifeGamemode.Server.WeaponDeal
private const int WEAPON_AMOUNT_COP_STUNGUN = 4;
public static bool checkWeaponDbyVehicle(Vehicle vehicle)
{
if (!vehicle.HasData("WeaponDealLoad") || vehicle.GetData<bool>("WeaponDealLoad") == false)
return false;
if ((vehicle.HasData("WeaponDealLoad") && vehicle.GetData<bool>("WeaponDealLoad") == true) ||
(vehicle.HasData("weaponDeal") && vehicle.GetData<bool>("weaponDeal") == true))
{
return true;
}
return true;
return false;
}
[RemoteEvent("startWeaponDeal")]
public void SrvEVENT_startWeaponDeal(Player client)
{
var user = client.GetUser();
if(user == null || user.FactionId == null)
{
return;
}
using (var context = new DatabaseContext(true))
{
FactionVehicle factionVehicle = context.FactionVehicles.Where(f => f.Model == VehicleHash.Burrito3 || f.Model == VehicleHash.Policet).ToList().Where(f => f.GetOwners().Contains(user.FactionId ?? 0)).FirstOrDefault();
@@ -37,10 +45,9 @@ namespace ReallifeGamemode.Server.WeaponDeal
return;
}
Vehicle fVeh = VehicleManager.GetVehicleFromServerVehicle(factionVehicle);
if (fVeh.HasData("weaponDeal") && fVeh.GetData<bool>("weaponDeal") == true)
if (checkWeaponDbyVehicle(fVeh))
{
ChatService.ErrorMessage(client, "Es läuft aktuell schon ein Waffentransport");
return;
@@ -55,7 +62,7 @@ namespace ReallifeGamemode.Server.WeaponDeal
WeaponDealPoints.factionWeaponDeal[user.FactionId.Value] = -1;
Vector3 vector;
vector = WeaponDealPoints.getRndWD_Route(client.GetUser().FactionId.Value);
vector = WeaponDealPoints.getRndWD_Route(user.FactionId.Value);
if (vector == new Vector3())
return;
fVeh.SetData<Vector3>("weaponDealPoint", vector);
@@ -189,7 +196,7 @@ namespace ReallifeGamemode.Server.WeaponDeal
fVeh.AddAttachment("weapondeal1", false);
fVeh.AddAttachment("weapondeal2", false);
InventoryManager.RemoveAllItemsfromVehicleInventory(fVeh);
int oMembers = NAPI.Pools.GetAllPlayers().Where(p => p.IsLoggedIn() && p.GetUser(context).FactionId == user.FactionId).Count();
int oMembers = NAPI.Pools.GetAllPlayers().Where(p => !p.IsAfk() && p.IsLoggedIn() && p.GetUser(context).FactionId == user.FactionId).Count();
if (factionVehicle.GetOwners().Contains(8) || factionVehicle.GetOwners().Contains(7))
{