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:
Lukas Moungos
2021-04-05 17:54:47 +02:00
parent 8ac14e057a e02a6b6af7
commit 481486f49b
4 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -331,6 +331,7 @@ namespace ReallifeGamemode.Server.Commands
deadPlayer.SendNotification($"Du wurdest von ~y~{player.Name}~s~ für ~g~{100.ToMoneyString()} ~s~wiederbelebt."); deadPlayer.SendNotification($"Du wurdest von ~y~{player.Name}~s~ für ~g~{100.ToMoneyString()} ~s~wiederbelebt.");
player.SendNotification($"Du hast ~y~{deadPlayer.Name}~s~ wiederbelebt und ~g~{Medic.ReviveIncome}$ ~s~für die Fraktion verdient."); player.SendNotification($"Du hast ~y~{deadPlayer.Name}~s~ wiederbelebt und ~g~{Medic.ReviveIncome}$ ~s~für die Fraktion verdient.");
deadPlayer.SetData("isDead", false); deadPlayer.SetData("isDead", false);
deadPlayer.SetData("reviveSperre", 5);
dbContext.Factions.Include(f => f.BankAccount).Where(f => f.Id == 2).First().BankAccount.Balance += Medic.ReviveIncome; dbContext.Factions.Include(f => f.BankAccount).Where(f => f.Id == 2).First().BankAccount.Balance += Medic.ReviveIncome;

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

@@ -616,9 +616,9 @@ namespace ReallifeGamemode.Server.Events
{ {
if (!player.IsLoggedIn()) return; if (!player.IsLoggedIn()) return;
if (player.GetData<bool>("healDecision") == true) if (player.GetData<bool>("healDecision") == true)
{ {
player.SetData<bool>("healDecision", false);
Medic.MakeHealDecision(player, true); Medic.MakeHealDecision(player, true);
player.SetData<bool>("healDecision", false);
} }
User u = player.GetUser(); User u = player.GetUser();
@@ -765,9 +765,9 @@ namespace ReallifeGamemode.Server.Events
if (!player.IsLoggedIn()) return; if (!player.IsLoggedIn()) return;
if (player.GetData<bool>("healDecision") == true) if (player.GetData<bool>("healDecision") == true)
{ {
player.SetData<bool>("healDecision", false);
Medic.MakeHealDecision(player, false); Medic.MakeHealDecision(player, false);
player.SetData<bool>("healDecision", false);
} }
if (!player.IsInVehicle) return; if (!player.IsInVehicle) return;

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

@@ -81,17 +81,37 @@ namespace ReallifeGamemode.Server.Factions.Medic
} }
} }
public static void UpdateReviveSperre()
{
var allRevivedPlayers = NAPI.Pools.GetAllPlayers().Where(c => c.HasData("reviveSperre"));
foreach(var player in allRevivedPlayers)
{
var timeLeft = player.GetData<int>("reviveSperre");
if (timeLeft > 0)
{
player.SetData("reviveSperre", timeLeft - 1);
}
else
{
player.ResetData("reviveSperre");
}
}
}
public static void MakeHealDecision(Player target, bool decision) public static void MakeHealDecision(Player target, bool decision)
{ {
var activeDecision = HealDecisions.FirstOrDefault(d => d.dTarget == target); var activeDecision = HealDecisions.FirstOrDefault(d => d.dTarget == target);
if(decision == false) if(decision == false)
{ {
activeDecision.dMedic.SendNotification(activeDecision.dTarget.Name + " hat den Heal ~r~abgelehnt",false); activeDecision.dMedic.SendNotification(activeDecision.dTarget.Name + " hat den Heal ~r~abgelehnt",false);
activeDecision.dTarget.SendNotification("Du hast den Heal ~r~abgelehnt", false);
return; return;
} }
else else
{ {
activeDecision.dMedic.SendNotification(activeDecision.dTarget.Name + " hat den Heal ~g~akzeptiert", false); activeDecision.dMedic.SendNotification(activeDecision.dTarget.Name + " hat den Heal ~g~akzeptiert", false);
activeDecision.dTarget.SendNotification("Du hast den Heal ~g~akzeptiert", false);
using var dbContext = new DatabaseContext(); using var dbContext = new DatabaseContext();
{ {
User targetUser = target.GetUser(dbContext); User targetUser = target.GetUser(dbContext);

1
ReallifeGamemode.Server/Util/ThreadTimers.cs
View File

@@ -59,6 +59,7 @@ namespace ReallifeGamemode.Server.Util
Jail.JailOut_Elapsed(); Jail.JailOut_Elapsed();
Economy.Timer_Elapsed(); Economy.Timer_Elapsed();
WeaponDealManager.Timer_Elapsed(); WeaponDealManager.Timer_Elapsed();
Medic.UpdateReviveSperre();
}); });
} }