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

16
ReallifeGamemode.Client/Interaction/factioninteraction.ts
View File

@@ -26,7 +26,6 @@ export default function factionInteraction(globalData: IGlobalData) {
var sortText;
var deadRespawned = false;
var timeLeft = null;
var deathTime;
var ticketName: string;
var pointsName: string;
@@ -324,7 +323,6 @@ export default function factionInteraction(globalData: IGlobalData) {
dimension: 0
});
reviveTaskMenuMedic.Close();
deathTime = tasks[index].TimeLeft;
mp.gui.chat.activate(true);
globalData.InMenu = false;
ambulanceImagePos = 0.325
@@ -332,7 +330,6 @@ export default function factionInteraction(globalData: IGlobalData) {
taskFinish = tasks[index].Position;
taskRange = mp.game.gameplay.getDistanceBetweenCoords(player.position.x, player.position.y, player.position.z, tasks[index].Position.x, tasks[index].Position.y, tasks[index].Position.z, true);
activeTask = tasks[index];
mp.events.callRemote("getTaskTimeLeft", tasks[index].Victim);
}
}
});
@@ -503,6 +500,7 @@ export default function factionInteraction(globalData: IGlobalData) {
});
mp.events.add('render', () => {
if (activeTask) {
rangeLeft = mp.game.gameplay.getDistanceBetweenCoords(player.position.x, player.position.y, player.position.z, taskFinish.x, taskFinish.y, taskFinish.z, true).toFixed(2);
if (rangeLeft > 1.9) {
@@ -526,33 +524,35 @@ export default function factionInteraction(globalData: IGlobalData) {
var currentDate = new Date();
if (timeLeft != null) {
if (deadRespawned == false) {
//timeLeft = Math.round(Math.abs(Math.floor(currentDate.getTime() / 1000) - activeTask.TimeLeft - 60));
if (timeLeft < 60) mp.events.call("cutMedicEarnings");
if (timeLeft < 120) mp.events.call("cutMedicEarnings");
} else {
//timeLeft = Math.round(Math.abs(Math.floor(currentDate.getTime() / 1000) - activeTask.TimeLeft - 120));
if (timeLeft < 1) mp.events.call("destroyMedicTaskCheckpoint");
}
if (deadRespawned == false) {
mp.game.graphics.drawText(timeLeft + "s ", [0.5, 0.88], {
mp.game.graphics.drawText(timeLeft + "s", [0.5, 0.85], {
font: 7,
color: [60, 179, 113, 255],
scale: [0.3, 0.3],
scale: [0.5, 0.5],
outline: true,
centre: true
});
} else {
{
mp.game.graphics.drawText(timeLeft + "s", [0.5, 0.88], {
mp.game.graphics.drawText(timeLeft + "s", [0.5, 0.85], {
font: 7,
color: [255, 203, 145, 255],
scale: [0.3, 0.3],
scale: [0.5, 0.5],
outline: true,
centre: true
});
}
}
}
}
});
}

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

@@ -1726,6 +1726,28 @@ 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;