Committing for merge

This commit is contained in:
VegaZ
2019-01-08 14:43:54 +01:00
parent 5c84dc177d
commit 6d2ccceb53
5 changed files with 91 additions and 18 deletions

View File

@@ -80,10 +80,10 @@ namespace reallife_gamemode.Server.Events
//MEDIC AUFTRAG
MedicTask reviveTask = new MedicTask()
{
Victim = player,
Victim = player.Name,
Position = player.Position,
CauseOfDeath = reason.ToString(),
Caller = player,
Caller = null,
Description = "Gestorben",
Time = DateTime.Now,
Type = 0

View File

@@ -71,7 +71,7 @@ namespace reallife_gamemode.Server.Events
{
//LSFD
case 2:
player.TriggerEvent("showFactionInteraction", user.FactionId, user.GetFaction().Name, user.FactionLeader, Medic.ReviveTasks.Count, Medic.HealTasks.Count, Medic.FireTasks.Count);
player.TriggerEvent("showFactionInteraction", user.FactionId, user.GetFaction().Name, user.FactionLeader, Medic.ReviveTasks.Count.ToString(), Medic.HealTasks.Count.ToString(), Medic.FireTasks.Count.ToString());
break;
}
}

View File

@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Text;
using GTANetworkAPI;
using Newtonsoft.Json;
/**
* @overview Life of German Reallife - Server Factions Medic Medic.cs
@@ -49,5 +50,21 @@ namespace reallife_gamemode.Server.Factions.Medic
break;
}
}
[RemoteEvent("loadMedicTasks")]
public void LoadMedicTasks(Client player, int type)
{
switch (type)
{
case 0:
player.TriggerEvent("showMedicTaskMenu", 0, JsonConvert.SerializeObject(ReviveTasks.ToArray()));
break;
case 1:
player.TriggerEvent("showMedicTaskMenu", 1, JsonConvert.SerializeObject(HealTasks.ToArray()));
break;
case 2:
player.TriggerEvent("showMedicTaskMenu", 2, JsonConvert.SerializeObject(FireTasks.ToArray()));
break;
}
}
}
}

View File

@@ -14,12 +14,12 @@ namespace reallife_gamemode.Server.Factions.Medic
{
public class MedicTask
{
public Client Victim { get; set; }
public string Victim { get; set; }
public Vector3 Position { get; set; }
public byte Type { get; set; }
public int Type { get; set; }
public string CauseOfDeath { get; set; }
public string Description { get; set; }
public Client Caller { get; set; }
public string Caller { get; set; }
public DateTime Time { get; set; }
}
}