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

7
Server/Commands/Admin.cs
View File

@@ -20,6 +20,7 @@ using reallife_gamemode.Server.Saves;
using reallife_gamemode.Server.Business;
using System.Text.RegularExpressions;
using reallife_gamemode.Server.Classes;
using reallife_gamemode.Server.Factions.Medic;
/**
* @overview Life of German Reallife - Admin Commands (Admin.cs)
@@ -1006,6 +1007,9 @@ namespace reallife_gamemode.Server.Commands
target.SetData("isDead", false);
NAPI.Player.SpawnPlayer(target, target.Position);
target.Health = 100;
MedicTask task = Medic.ReviveTasks.FirstOrDefault(t => t.Victim == target.Name);
Medic.RemoveTaskFromList(task);
}
[Command("setarmor", "~m~Benutzung: ~s~/setarmor [Spieler] (Armor)")]
@@ -1268,6 +1272,9 @@ namespace reallife_gamemode.Server.Commands
NAPI.Player.SpawnPlayer(managedClient, managedClient.Position);
managedClient.Health = 100;
//MedicTask task = Medic.ReviveTasks.FirstOrDefault(t => t.Victim == managedClient.Name);
//Medic.RemoveTaskFromList(task);
}
player.SendChatMessage("~b~Du hast " + playerRevided + " Spieler wiederbelebt.");

8
Server/Commands/Faction.cs
View File

@@ -3,6 +3,7 @@ using Newtonsoft.Json;
using reallife_gamemode.Model;
using reallife_gamemode.Server.Entities;
using reallife_gamemode.Server.Extensions;
using reallife_gamemode.Server.Factions.Medic;
using reallife_gamemode.Server.Services;
using reallife_gamemode.Server.Util;
using System;
@@ -236,13 +237,16 @@ namespace reallife_gamemode.Server.Commands
player.SendChatMessage("~r~[FEHLER]~s~ Du kannst dich nicht selbst wiederbeleben!");
return;
}
player.PlayAnimation("amb@medic@standing@kneel@enter", "enter", 0);
player.PlayAnimation("amb@medic@standing@kneel@enter", "enter", 0);
deadPlayer.TriggerEvent("onPlayerRevived");
deadPlayer.SendNotification("Du wurdest von ~r~" + player.Name + "~s~ wiederbelebt.");
deadPlayer.SetData("isDead", false);
NAPI.Player.SpawnPlayer(deadPlayer, deadPlayer.Position);
deadPlayer.Health = 50;
MedicTask task = Medic.ReviveTasks.FirstOrDefault(t => t.Victim == deadPlayer.Name);
Medic.RemoveTaskFromList(task);
}
[Command("heal", "~m~Benutzung: ~s~/heal [Spieler]")] //TODO Eventuell noch mit Geldbetrag wie bei SA:MP

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)
{

87
Server/Factions/Medic/Medic.cs Normal file
View File

@@ -0,0 +1,87 @@
using System;
using System.Collections.Generic;
using System.Text;
using GTANetworkAPI;
using Newtonsoft.Json;
using reallife_gamemode.Server.Services;
/**
* @overview Life of German Reallife - Server Factions Medic Medic.cs
* @author VegaZ
* @copyright (c) 2008 - 2018 Life of German
*/
namespace reallife_gamemode.Server.Factions.Medic
{
public class Medic : Script
{
public static List<MedicTask> ReviveTasks = new List<MedicTask>();
public static List<MedicTask> HealTasks = new List<MedicTask>();
public static List<MedicTask> FireTasks = new List<MedicTask>();
public static void AddTaskToList(MedicTask task)
{
switch (task.Type)
{
case 0:
ReviveTasks.Add(task);
break;
case 1:
HealTasks.Add(task);
break;
case 2:
FireTasks.Add(task);
break;
}
}
public static void RemoveTaskFromList(MedicTask task)
{
switch (task.Type)
{
case 0:
ReviveTasks.Remove(task);
break;
case 1:
HealTasks.Remove(task);
break;
case 2:
FireTasks.Remove(task);
break;
}
}
[RemoteEvent("loadMedicTasks")]
public void LoadMedicTasks(Client player, int type)
{
switch (type)
{
case 0:
player.TriggerEvent("showMedicTasks", 0, JsonConvert.SerializeObject(ReviveTasks));
break;
case 1:
player.TriggerEvent("showMedicTasks", 1, JsonConvert.SerializeObject(HealTasks));
break;
case 2:
player.TriggerEvent("showMedicTasks", 2, JsonConvert.SerializeObject(FireTasks));
break;
}
}
[RemoteEvent("updateMedicTask")]
public void UpdateMedicTasks(Client player, int type, int index, string medicName)
{
switch (type)
{
case 0:
ReviveTasks[index].MedicName = medicName;
break;
case 1:
HealTasks[index].MedicName = medicName;
break;
case 2:
FireTasks[index].MedicName = medicName;
break;
}
}
}
}

26
Server/Factions/Medic/MedicTask.cs Normal file
View File

@@ -0,0 +1,26 @@
using System;
using System.Collections.Generic;
using System.Text;
using GTANetworkAPI;
/**
* @overview Life of German Reallife - Server Factions Medic MedicTask.cs
* @author VegaZ
* @copyright (c) 2008 - 2018 Life of German
*/
namespace reallife_gamemode.Server.Factions.Medic
{
public class MedicTask
{
public string Victim { get; set; }
public Vector3 Position { get; set; }
public int Type { get; set; }
public string CauseOfDeath { get; set; }
public string Description { get; set; }
public string Caller { get; set; }
public DateTime Time { get; set; }
public string MedicName { get; set; }
}
}

8
Server/Managers/InteractionManager.cs
View File

@@ -16,6 +16,11 @@ namespace reallife_gamemode.Server.Managers
{
public class InteractionManager : Script
{
#region Umgebungsinteraktionen PFEILTASTE-HOCH
#endregion
#region Eigeninteraktionen PFEILTASTE-RUNTER
#endregion
#region Spielerinteraktionen PFEILTASTE-LINKS
[RemoteEvent("openTradeInventory")]
public void OpenTradeInventory(Client player, string targetPlayer)
{
@@ -50,5 +55,8 @@ namespace reallife_gamemode.Server.Managers
tradeRequester.TriggerEvent("unlockTradeItems");
}
}
#endregion
#region Fraktionsinteraktionen / Jobinteraktionen PFEILTASTE-RECHTS
#endregion
}
}