aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge interaction to develop

Browse Source
This commit is contained in:
VegaZ
2019-02-25 20:03:21 +01:00
parent adcd62ebb1 ad51f56b32
commit d2181c4987
13 changed files with 449 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Server/Events/Death.cs
View File

@@ -6,6 +6,7 @@ using GTANetworkAPI;
using GTANetworkMethods;
using reallife_gamemode.Model;
using reallife_gamemode.Server.Extensions;
using reallife_gamemode.Server.Factions.Medic;
using reallife_gamemode.Server.Services;
using reallife_gamemode.Server.Util;
@@ -76,6 +77,21 @@ namespace reallife_gamemode.Server.Events
ChatService.BroadcastAdmin(message, AdminLevel.ADMIN);
}
}
//MEDIC AUFTRAG
MedicTask reviveTask = new MedicTask()
{
Victim = player.Name,
Position = player.Position,
CauseOfDeath = reason.ToString(),
Caller = null,
Description = "Gestorben",
Time = DateTime.Now,
Type = 0,
MedicName = "none"
};
Medic.AddTaskToList(reviveTask);
//TODO PICTURE NOTIFICATION + SOUND für Medics
using (var userDeath = new DatabaseContext())
{

20
Server/Events/Key.cs
View File

@@ -8,6 +8,7 @@ using reallife_gamemode.Model;
using reallife_gamemode.Server.Classes;
using reallife_gamemode.Server.Entities;
using reallife_gamemode.Server.Extensions;
using reallife_gamemode.Server.Factions.Medic;
using reallife_gamemode.Server.Inventory;
using reallife_gamemode.Server.Inventory.Interfaces;
using reallife_gamemode.Server.Managers;
@@ -60,12 +61,21 @@ namespace reallife_gamemode.Server.Events
}
player.TriggerEvent("showPlayerInteraction", JsonConvert.SerializeObject(nearbyPlayerList));
}
else
{
player.SendNotification("~r~Es ist niemand in deiner N\u00e4he!", false);
}
}
[RemoteEvent("keyPress:RIGHT_ARROW")]
public void KeyPressRightArrow(Client player)
{
if (!player.IsLoggedIn()) return;
User user = player.GetUser();
switch (user.FactionId)
{
//LSFD
case 2:
player.TriggerEvent("showFactionInteraction", user.FactionId, user.GetFaction().Name, user.FactionLeader, Medic.ReviveTasks.Count.ToString(), Medic.HealTasks.Count.ToString(), Medic.FireTasks.Count.ToString());
break;
}
}
[RemoteEvent("keyPress:E")]
public void KeyPressE(Client player)
{