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 16:19:02 +02:00
parent 996bd29a37 1883773d72
commit 39ca388150
2 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,8 +13,6 @@ export default function factionInteraction(globalData: IGlobalData) {
var screenRes = mp.game.graphics.getScreenResolution(0, 0); var screenRes = mp.game.graphics.getScreenResolution(0, 0);
var player = mp.players.local; var player = mp.players.local;
var tasks; var tasks;
var deathSeconds;
var initTasks;
var newTasks; var newTasks;
var sorting = 0; var sorting = 0;
var firstSorting = true; var firstSorting = true;
@@ -27,7 +25,7 @@ export default function factionInteraction(globalData: IGlobalData) {
var rangeLeft; var rangeLeft;
var sortText; var sortText;
var deadRespawned = false; var deadRespawned = false;
var timeLeft = 0; var timeLeft = null;
var deathTime; var deathTime;
var ticketName: string; var ticketName: string;
@@ -40,6 +38,7 @@ export default function factionInteraction(globalData: IGlobalData) {
/*mp.events.add("updateFactionBlips", (type, taskList) => { /*mp.events.add("updateFactionBlips", (type, taskList) => {
}); });
});*/ });*/
mp.events.add("showFactionInteractionLSPD", (userFactionId, isDuty, userFactionName, isFactionLeader) => { mp.events.add("showFactionInteractionLSPD", (userFactionId, isDuty, userFactionName, isFactionLeader) => {
//LSPD //LSPD
@@ -280,13 +279,9 @@ export default function factionInteraction(globalData: IGlobalData) {
}); });
mp.events.add("showMedicTasks", (type, taskList, deathTimes) => { mp.events.add("showMedicTasks", (type, taskList) => {
tasks = JSON.parse(taskList); tasks = JSON.parse(taskList);
deathSeconds = JSON.parse(deathTimes);
if (sorting === 0) {
initTasks = tasks;
}
//mp.events.call("sortFactionTasks", false); //mp.events.call("sortFactionTasks", false);
@@ -407,6 +402,7 @@ export default function factionInteraction(globalData: IGlobalData) {
} }
}); });
/*
mp.events.add("sortFactionTasks", (sortByKey) => { mp.events.add("sortFactionTasks", (sortByKey) => {
if (firstSorting) { if (firstSorting) {
sortText = "Nach Uhrzeit"; sortText = "Nach Uhrzeit";
@@ -462,7 +458,7 @@ export default function factionInteraction(globalData: IGlobalData) {
} }
} }
} }
}); });*/
function getDistance1(index) { function getDistance1(index) {
return mp.game.gameplay.getDistanceBetweenCoords(player.position.x, player.position.y, player.position.z, newTasks[index].Position.x, newTasks[index].Position.y, newTasks[index].Position.z, true).toFixed(2); return mp.game.gameplay.getDistanceBetweenCoords(player.position.x, player.position.y, player.position.z, newTasks[index].Position.x, newTasks[index].Position.y, newTasks[index].Position.z, true).toFixed(2);
@@ -479,7 +475,7 @@ export default function factionInteraction(globalData: IGlobalData) {
activeCheckpoint.destroy(); activeCheckpoint.destroy();
activeCheckpoint = null; activeCheckpoint = null;
activeTask = null; activeTask = null;
timeLeft = 0; timeLeft = null;
mp.events.callRemote("MedicTaskTimeout"); mp.events.callRemote("MedicTaskTimeout");
}); });
@@ -490,18 +486,19 @@ export default function factionInteraction(globalData: IGlobalData) {
mp.events.callRemote("PayCutMedicEarnings"); mp.events.callRemote("PayCutMedicEarnings");
activeTask = null; activeTask = null;
deadRespawned = false; deadRespawned = false;
timeLeft = 0; timeLeft = null;
} else if (activeTask.Type == 1){ } else if (activeTask.Type == 1){
activeCheckpoint.destroy(); activeCheckpoint.destroy();
activeCheckpoint = null; activeCheckpoint = null;
mp.events.callRemote("delHealTaskAsMedic", activeTask.Victim); mp.events.callRemote("delHealTaskAsMedic", activeTask.Victim);
activeTask = null; activeTask = null;
timeLeft = null;
} }
}); });
mp.events.add('setTaskTimeLeft', (taskTimeLeft) => { mp.events.add('setTaskTimeLeft', (taskTimeLeft) => {
if (activeTask) { if (activeTask) {
activeTask.TimeLeft = taskTimeLeft; timeLeft = taskTimeLeft;
} }
}); });
@@ -530,15 +527,15 @@ export default function factionInteraction(globalData: IGlobalData) {
var currentDate = new Date(); var currentDate = new Date();
if (deadRespawned == false) { if (deadRespawned == false) {
timeLeft = Math.round(Math.abs(Math.floor(currentDate.getTime() / 1000) - activeTask.TimeLeft - 60)); //timeLeft = Math.round(Math.abs(Math.floor(currentDate.getTime() / 1000) - activeTask.TimeLeft - 60));
if (timeLeft < 1) mp.events.call("cutMedicEarnings"); if (timeLeft < 60) mp.events.call("cutMedicEarnings");
} else { } else {
timeLeft = Math.round(Math.abs(Math.floor(currentDate.getTime() / 1000) - activeTask.TimeLeft - 120)); //timeLeft = Math.round(Math.abs(Math.floor(currentDate.getTime() / 1000) - activeTask.TimeLeft - 120));
if (timeLeft < 1) mp.events.call("destroyMedicTaskCheckpoint"); if (timeLeft < 1) mp.events.call("destroyMedicTaskCheckpoint");
} }
if (deadRespawned == false) { if (deadRespawned == false) {
mp.game.graphics.drawText(activeTask.TimeLeft.toString() + "s ", [0.5, 0.88], { mp.game.graphics.drawText(timeLeft + "s ", [0.5, 0.88], {
font: 7, font: 7,
color: [60, 179, 113, 255], color: [60, 179, 113, 255],
scale: [0.3, 0.3], scale: [0.3, 0.3],
@@ -547,7 +544,7 @@ export default function factionInteraction(globalData: IGlobalData) {
}); });
} else { } else {
{ {
mp.game.graphics.drawText(activeTask.TimeLeft.toString() + "s", [0.5, 0.88], { mp.game.graphics.drawText(timeLeft + "s", [0.5, 0.88], {
font: 7, font: 7,
color: [255, 203, 145, 255], color: [255, 203, 145, 255],
scale: [0.3, 0.3], scale: [0.3, 0.3],

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

@@ -75,9 +75,17 @@ namespace ReallifeGamemode.Server.Factions.Medic
public static void UpdateTaskTimeLeft() public static void UpdateTaskTimeLeft()
{ {
DateTime actualTime = DateTime.Now; DateTime actualTime = DateTime.Now;
foreach(var task in ReviveTasks) if (ReviveTasks.Count != 0)
{ {
task.TimeLeft = (Int32)(((DateTimeOffset)task.Time).ToUnixTimeSeconds() - ((DateTimeOffset)actualTime).ToUnixTimeSeconds() - reviveTaskTime); foreach (var task in ReviveTasks)
{
if (task.MedicName != null)
{
var taskTimeLeft = (Int32)(((DateTimeOffset)task.Time).ToUnixTimeSeconds() - ((DateTimeOffset)actualTime).ToUnixTimeSeconds() - reviveTaskTime);
task.TimeLeft = taskTimeLeft;
PlayerService.GetPlayerByNameOrId(task.MedicName).TriggerEvent("setTaskTimeLeft", taskTimeLeft);
}
}
} }
} }
@@ -87,21 +95,15 @@ namespace ReallifeGamemode.Server.Factions.Medic
switch (type) switch (type)
{ {
case 0: case 0:
List<long> deathTimes = new List<long>(); player.TriggerEvent("showMedicTasks", 0, JsonConvert.SerializeObject(ReviveTasks));
foreach(var task in ReviveTasks)
{
deathTimes.Add(((DateTimeOffset)task.Time).ToUnixTimeSeconds());
}
player.TriggerEvent("showMedicTasks", 0, JsonConvert.SerializeObject(ReviveTasks), JsonConvert.SerializeObject(deathTimes));
break; break;
case 1: case 1:
player.TriggerEvent("showMedicTasks", 1, JsonConvert.SerializeObject(HealTasks), null); player.TriggerEvent("showMedicTasks", 1, JsonConvert.SerializeObject(HealTasks));
break; break;
case 2: case 2:
player.TriggerEvent("showMedicTasks", 2, JsonConvert.SerializeObject(FireTasks), null); player.TriggerEvent("showMedicTasks", 2, JsonConvert.SerializeObject(FireTasks));
break; break;
} }
} }