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

Push files

Browse Source
This commit is contained in:
VegaZ
2019-02-25 19:59:02 +01:00
parent ff7374fc07
commit ad51f56b32
8 changed files with 193 additions and 28 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

3
Server/Events/Death.cs
View File

@@ -86,7 +86,8 @@ namespace reallife_gamemode.Server.Events
Caller = null,
Description = "Gestorben",
Time = DateTime.Now,
Type = 0
Type = 0,
MedicName = "none"
};
Medic.AddTaskToList(reviveTask);

23
Server/Factions/Medic/Medic.cs
View File

@@ -3,6 +3,7 @@ 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
@@ -56,13 +57,29 @@ namespace reallife_gamemode.Server.Factions.Medic
switch (type)
{
case 0:
player.TriggerEvent("showMedicTaskMenu", 0, JsonConvert.SerializeObject(ReviveTasks.ToArray()));
player.TriggerEvent("showMedicTasks", 0, JsonConvert.SerializeObject(ReviveTasks));
break;
case 1:
player.TriggerEvent("showMedicTaskMenu", 1, JsonConvert.SerializeObject(HealTasks.ToArray()));
player.TriggerEvent("showMedicTasks", 1, JsonConvert.SerializeObject(HealTasks));
break;
case 2:
player.TriggerEvent("showMedicTaskMenu", 2, JsonConvert.SerializeObject(FireTasks.ToArray()));
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;
}
}

1
Server/Factions/Medic/MedicTask.cs
View File

@@ -21,5 +21,6 @@ namespace reallife_gamemode.Server.Factions.Medic
public string Description { get; set; }
public string Caller { get; set; }
public DateTime Time { get; set; }
public string MedicName { get; set; }
}
}