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

Start Medic System / FactionInteraction

Browse Source
This commit is contained in:
VegaZ
2018-12-27 22:21:59 +01:00
parent 4ea09f0034
commit 5c84dc177d
10 changed files with 210 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Client/Gui/deathscreen.js
View File

@@ -26,6 +26,7 @@ mp.events.add("startDeathTimer", (isAdmin) => {
else {
mp.gui.chat.activate(false);
}
mp.game.audio.playSoundFrontend(-1, "Bed", "WastedSounds", true);
deathDate = new Date();
respawnTime = Math.floor(deathDate.getTime() / 1000 + 120);
fade = 255 - 120;

62
Client/Interaction/factioninteraction.js Normal file
View File

@@ -0,0 +1,62 @@
let screenRes = mp.game.graphics.getScreenResolution(0, 0);
const NativeUI = require("nativeui");
const Menu = NativeUI.Menu;
const UIMenuItem = NativeUI.UIMenuItem;
const UIMenuListItem = NativeUI.UIMenuListItem;
const UIMenuCheckboxItem = NativeUI.UIMenuCheckboxItem;
const BadgeStyle = NativeUI.BadgeStyle;
const Point = NativeUI.Point;
const ItemsCollection = NativeUI.ItemsCollection;
const Color = NativeUI.Color;
mp.events.add("showFactionInteraction", (userFactionId, userFactionName, isFactionLeader, reviveTaskCount, healTaskCount, fireTaskCount) => {
mp.gui.chat.activate(false);
globalData.Interaction = true;
let factionInteractionMenu = new Menu("Fraktionsinteraktion", userFactionName, new Point(0, screenRes.y / 2));
if (isFactionLeader) {
let leaderMenu = new UIMenuItem("Leadermen\u00fc", "Verwaltung der Fraktion");
leaderMenu.SetRightBadge(BadgeStyle.Star);
factionInteractionMenu.AddItem(leaderMenu);
}
switch (userFactionId) {
case 2:
let reviveTaskMenu = new UIMenuItem("Reviveauftr\u00e4ge");
reviveTaskMenu.SetRightLabel(reviveTaskCount.toString())
factionInteractionMenu.AddItem(reviveTaskMenu);
let healTaskMenu = new UIMenuItem("Healauftr\u00e4ge");
reviveTaskMenu.SetRightLabel(healTaskCount.toString())
factionInteractionMenu.AddItem(healTaskMenu);
let fireTaskMenu = new UIMenuItem("Reviveauftr\u00e4ge");
reviveTaskMenu.SetRightLabel(fireTaskCount.toString())
factionInteractionMenu.AddItem(fireTaskMenu);
break;
}
let cancelItem = new UIMenuItem("Schlie\u00dfen", "Schlie\u00dft die Spielerinteraktion");
cancelItem.BackColor = new Color(213, 0, 0);
cancelItem.HighlightedBackColor = new Color(229, 57, 53);
factionInteractionMenu.AddItem(cancelItem);
factionInteractionMenu.Visible = true;
factionInteractionMenu.ItemSelect.on((item) => {
if (item.Text === "Schlie\u00dfen") {
factionInteractionMenu.Visible = false;
mp.gui.chat.activate(true);
globalData.Interaction = false;
}
});
factionInteractionMenu.MenuClose.on(() => {
mp.gui.chat.activate(true);
globalData.Interaction = false;
});
});

8
Client/Interaction/interaction.js → Client/Interaction/playerinteraction.js
View File

@@ -42,7 +42,7 @@ const Color = NativeUI.Color;
mp.events.add("showPlayerInteraction", (nearPlayerArr) => {
mp.gui.chat.activate(false);
nearbyPlayers = JSON.parse(nearPlayerArr);
globalData.PlayerInteraction = true;
globalData.Interaction = true;
let playerInteractionMenu = new Menu("Spielerinteraktion", "", new Point(0, screenRes.y / 2));
let playerSelect = new UIMenuListItem("Mit", "~y~W\u00e4hle den Spieler aus.", new ItemsCollection(nearbyPlayers));
playerInteractionMenu.AddItem(playerSelect);
@@ -60,17 +60,17 @@ mp.events.add("showPlayerInteraction", (nearPlayerArr) => {
mp.events.callRemote("openTradeInventory", playerSelect.SelectedValue);
playerInteractionMenu.Visible = false;
mp.gui.chat.activate(true);
globalData.PlayerInteraction = false;
globalData.Interaction = false;
} else if (item.Text === "Schlie\u00dfen") {
playerInteractionMenu.Visible = false;
mp.gui.chat.activate(true);
globalData.PlayerInteraction = false;
globalData.Interaction = false;
}
});
playerInteractionMenu.MenuClose.on(() => {
mp.gui.chat.activate(true);
globalData.PlayerInteraction = false;
globalData.Interaction = false;
});
});

22
Client/Player/keys.js
View File

@@ -6,7 +6,6 @@
//https://docs.microsoft.com/de-de/windows/desktop/inputdev/virtual-key-codes
var chat = false;
var showInventory = false;
var showGui = true;
var showInv = false;
@@ -22,12 +21,31 @@ mp.keys.bind(0x0D, false, function () {
//LEFT ARROW (Interaktion mit anderen Spielern)
mp.keys.bind(0x25, false, function () {
if (!globalData.InChat && !showInv && !globalData.PlayerInteraction) {
if (!globalData.InChat && !showInv && !globalData.Interaction) {
mp.events.callRemote("keyPress:LEFT_ARROW");
}
});
//UP ARROW (Interaktion mit anderen Spielern)
mp.keys.bind(0x26, false, function () {
if (!globalData.InChat && !showInv && !globalData.Interaction) {
mp.events.callRemote("keyPress:UP_ARROW");
}
});
//RIGHT ARROW (Interaktion mit anderen Spielern)
mp.keys.bind(0x27, false, function () {
if (!globalData.InChat && !showInv && !globalData.Interaction) {
mp.events.callRemote("keyPress:RIGHT_ARROW");
}
});
//DOWN ARROW (Interaktion mit anderen Spielern)
mp.keys.bind(0x28, false, function () {
if (!globalData.InChat && !showInv && !globalData.Interaction) {
mp.events.callRemote("keyPress:DOWN_ARROW");
}
});
//F7 //Unshowalles
mp.keys.bind(0x76, false, function () {
if (showGui === true) {

9
Client/index.js
View File

@@ -2,12 +2,12 @@
* @overview Life of German Reallife - Login index.js
* @author VegaZ, hydrant
* @copyright (c) 2008 - 2018 Life of German
*/
**/
let globalData = {
InTuning: false,
HideGui: false,
PlayerInteraction: false,
Interaction: false,
InChat: false
};
@@ -19,6 +19,7 @@ require('./Business/main.js');
require('./Business/cardealer.js');
require('./CharCreator/index.js');
require('./coloredhlights');
require('./DoorManager/doormanager.js');
@@ -33,7 +34,8 @@ require('./Gui/Inventory/inventory.js');
require('./Gui/vehiclemenu/main.js');
require('./Gui/interiors.js');
require('./Interaction/interaction.js');
require('./Interaction/factioninteraction.js');
require('./Interaction/playerinteraction.js');
require('./Login/main.js');
@@ -43,6 +45,7 @@ require('./Player/quit.js');
require('./Player/freecam.js');
require('./Save/main.js');
require('./Speedometer/index.js');
require('./Tuning/main.js');

15
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,20 @@ namespace reallife_gamemode.Server.Events
ChatService.BroadcastAdmin(message, AdminLevel.ADMIN);
}
}
//MEDIC AUFTRAG
MedicTask reviveTask = new MedicTask()
{
Victim = player,
Position = player.Position,
CauseOfDeath = reason.ToString(),
Caller = player,
Description = "Gestorben",
Time = DateTime.Now,
Type = 0
};
Medic.AddTaskToList(reviveTask);
//TODO PICTURE NOTIFICATION + SOUND für Medics
using (var userDeath = new DatabaseContext())
{

14
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,9 +61,18 @@ namespace reallife_gamemode.Server.Events
}
player.TriggerEvent("showPlayerInteraction", JsonConvert.SerializeObject(nearbyPlayerList));
}
else
}
[RemoteEvent("keyPress:RIGHT_ARROW")]
public void KeyPressRightArrow(Client player)
{
player.SendNotification("~r~Es ist niemand in deiner N\u00e4he!", false);
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, Medic.HealTasks.Count, Medic.FireTasks.Count);
break;
}
}

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

@@ -0,0 +1,53 @@
using System;
using System.Collections.Generic;
using System.Text;
using GTANetworkAPI;
/**
* @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;
}
}
}
}

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

@@ -0,0 +1,25 @@
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 Client Victim { get; set; }
public Vector3 Position { get; set; }
public byte Type { get; set; }
public string CauseOfDeath { get; set; }
public string Description { get; set; }
public Client Caller { get; set; }
public DateTime Time { 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
}
}