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

Refresh TicketSystem + FIB Interaktionsmenü

Browse Source
This commit is contained in:
Mac_Slash
2020-04-11 17:04:38 +02:00
parent 2d3317bed6
commit ed4b1d249c
4 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ReallifeGamemode.Client/Interaction/factioninteraction.ts
View File

@@ -39,7 +39,7 @@ export default function factionInteraction(globalData: IGlobalData) {
//LSPD //LSPD
let ticketTaskMenuLSPD; let ticketTaskMenuLSPD;
let pointsTaskMenuLSPD; let pointsTaskMenuLSPD;
if (userFactionId == 1) { if (userFactionId == 1 || userFactionId == 3) {
if (isDuty) { if (isDuty) {
mp.gui.chat.activate(false); mp.gui.chat.activate(false);
globalData.InMenu = true; globalData.InMenu = true;

16
ReallifeGamemode.Client/Interaction/interactionmenu.ts
View File

@@ -337,25 +337,25 @@ export default function (globalData: IGlobalData) {
return menu; return menu;
} }
function getTicketMenu(ticket_amount: number, parentMenu: NativeUI.Menu): NativeUI.Menu { function getTicketMenu(ticket_amount: number, parentMenu: NativeUI.Menu): NativeUI.Menu {
var factionMenu = new NativeUI.Menu("Ticket", `Ticket in Höhe von ${ticket_amount}$`, new Point(50, 50), null, null); var ticketMenu = new NativeUI.Menu("Ticket", `Ticket in Höhe von ${ticket_amount}$`, new Point(50, 50), null, null);
factionMenu.AddItem(new UIMenuItem("Ticket annehmen")); ticketMenu.AddItem(new UIMenuItem("Ticket annehmen"));
factionMenu.AddItem(new UIMenuItem("Ticket ablehnen")); ticketMenu.AddItem(new UIMenuItem("Ticket ablehnen"));
factionMenu.Visible = false; ticketMenu.Visible = false;
factionMenu.ItemSelect.on((item, index) => { ticketMenu.ItemSelect.on((item, index) => {
if (index === 0) // Ticket annehmen if (index === 0) // Ticket annehmen
{ {
parentMenu.Close();
mp.events.callRemote("CLIENT:InteractionMenu_Ticket", "Angenommen", ticket_amount); mp.events.callRemote("CLIENT:InteractionMenu_Ticket", "Angenommen", ticket_amount);
parentMenu.Close(true);
} }
else if (index === 1) // Ticket ablehnen else if (index === 1) // Ticket ablehnen
{ {
parentMenu.Close();
mp.events.callRemote("CLIENT:InteractionMenu_Ticket", "Abgelehnt", ticket_amount); mp.events.callRemote("CLIENT:InteractionMenu_Ticket", "Abgelehnt", ticket_amount);
parentMenu.Close(true);
} }
}); });
return factionMenu; return ticketMenu;
} }
} }

4
ReallifeGamemode.Server/Events/Key.cs
View File

@@ -106,6 +106,10 @@ namespace ReallifeGamemode.Server.Events
case 2: case 2:
player.TriggerEvent("showFactionInteractionMedic", user.FactionId, user.GetData<bool>("duty"), user.Faction.Name, user.FactionLeader, Medic.ReviveTasks.Count.ToString(), Medic.HealTasks.Count.ToString(), Medic.FireTasks.Count.ToString()); player.TriggerEvent("showFactionInteractionMedic", user.FactionId, user.GetData<bool>("duty"), user.Faction.Name, user.FactionLeader, Medic.ReviveTasks.Count.ToString(), Medic.HealTasks.Count.ToString(), Medic.FireTasks.Count.ToString());
break; break;
//FIB
case 3:
player.TriggerEvent("showFactionInteractionLSPD", user.FactionId, user.GetData<bool>("duty"), user.Faction.Name, user.FactionLeader);
break;
} }
} }

9
ReallifeGamemode.Server/Managers/InteractionManager.cs
View File

@@ -524,16 +524,17 @@ namespace ReallifeGamemode.Server.Managers
dbContext.SaveChanges(); dbContext.SaveChanges();
} }
target.ResetData("ticket_boolean"); target.ResetData("ticket_boolean");
NAPI.Data.ResetEntityData(target, "ticket_amount"); target.ResetData("ticket_amount");
NAPI.Data.ResetEntityData(target, "ticket_player"); target.ResetData("ticket_player");
} }
else if (type == "Abgelehnt") else if (type == "Abgelehnt")
{ {
target.SendNotification($"~r~Du hast das Ticket über ~b~{ticket_amount}$ ~r~abgelehnt.", true); target.SendNotification($"~r~Du hast das Ticket über ~b~{ticket_amount}$ ~r~abgelehnt.", true);
player.SendNotification($"~y~{targetname} ~r~hat das Ticket über ~b~{ticket_amount}$ ~r~abgelehnt.", true); player.SendNotification($"~y~{targetname} ~r~hat das Ticket über ~b~{ticket_amount}$ ~r~abgelehnt.", true);
target.ResetData("ticket_boolean"); target.ResetData("ticket_boolean");
NAPI.Data.ResetEntityData(target, "ticket_amount"); target.ResetData("ticket_amount");
NAPI.Data.ResetEntityData(target, "ticket_player"); target.ResetData("ticket_player");
} }
} }
#endregion #endregion