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-04 17:32:21 +02:00
parent b781af9a75 f6475ac48a
commit 58dd14b816
4 changed files with 55 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1726,7 +1726,29 @@ namespace ReallifeGamemode.Server.Commands
#endregion Admin
#region ALevel1337
/*NUR ZUM TESTEN
[Command("fakedeath", "~m~Benutzung:~s~ /fakedeath")]
public void CmdAdmFakeDeath(Player player)
{
if (!player.GetUser()?.IsAdmin(AdminLevel.PROJEKTLEITUNG) ?? true)
{
ChatService.NotAuthorized(player);
return;
}
MedicTask reviveTask = new MedicTask()
{
Victim = player.Name,
Position = player.Position,
CauseOfDeath = "FAKE",
Caller = null,
Description = "Gestorben",
Time = DateTime.Now,
Type = MedicTaskType.REVIVE,
MedicName = "none"
};
Medic.AddTaskToList(reviveTask);
}*/
[Command("setsvar", "~m~Benutzung:~s~ /setsvar [ID] [WERT]")]
public void CmdAdmSetSvar(Player player, int varId, int varValue)
{

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

@@ -24,7 +24,7 @@ namespace ReallifeGamemode.Server.Factions.Medic
public static List<MedicTask> FireTasks = new List<MedicTask>();
public static int ReviveIncome = 100;
public static int dutyMedics = 0;
public static int reviveTaskTime = 120;
public static int reviveTaskTime = 240;
public static void AddTaskToList(MedicTask task)
{
@@ -81,9 +81,10 @@ namespace ReallifeGamemode.Server.Factions.Medic
{
if (task.MedicName != null)
{
var taskTimeLeft = (Int32)(((DateTimeOffset)task.Time).ToUnixTimeSeconds() - ((DateTimeOffset)actualTime).ToUnixTimeSeconds() - reviveTaskTime);
var taskTimeLeft = Math.Abs((Int32)(((DateTimeOffset)actualTime).ToUnixTimeSeconds() - ((DateTimeOffset)task.Time).ToUnixTimeSeconds() - reviveTaskTime));
task.TimeLeft = taskTimeLeft;
PlayerService.GetPlayerByNameOrId(task.MedicName).TriggerEvent("setTaskTimeLeft", taskTimeLeft);
var medic = PlayerService.GetPlayerByNameOrId(task.MedicName);
if(task.MedicName != "none") medic.TriggerEvent("setTaskTimeLeft", taskTimeLeft);
}
}
}

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

@@ -22,6 +22,9 @@ namespace ReallifeGamemode.Server.Util
timer500.Start();
timer500.Elapsed += Timer500_Elapsed;
timer1000.Start();
timer1000.Elapsed += Timer1000_Elapsed;
timer2500.Start();
timer2500.Elapsed += Timer2500_Elapsed;