diff --git a/ReallifeGamemode.Client/Interaction/factioninteraction.ts b/ReallifeGamemode.Client/Interaction/factioninteraction.ts index 5a4f496a..45a3efb1 100644 --- a/ReallifeGamemode.Client/Interaction/factioninteraction.ts +++ b/ReallifeGamemode.Client/Interaction/factioninteraction.ts @@ -39,7 +39,7 @@ export default function factionInteraction(globalData: IGlobalData) { //LSPD let ticketTaskMenuLSPD; let pointsTaskMenuLSPD; - if (userFactionId == 1) { + if (userFactionId == 1 || userFactionId == 3) { if (isDuty) { mp.gui.chat.activate(false); globalData.InMenu = true; diff --git a/ReallifeGamemode.Client/Interaction/interactionmenu.ts b/ReallifeGamemode.Client/Interaction/interactionmenu.ts index 6839da83..ed340470 100644 --- a/ReallifeGamemode.Client/Interaction/interactionmenu.ts +++ b/ReallifeGamemode.Client/Interaction/interactionmenu.ts @@ -26,7 +26,7 @@ export default function (globalData: IGlobalData) { var groupItem = new UIMenuItem("Gruppe", "Verwalte deine Gruppe"); var paycheckItem = new UIMenuItem("Gehaltsscheck", "Schaue dir deinen Verdienst der letzten Stunde an"); - + var licenseItem = new UIMenuItem("Lizenzen", "Lizenzen Informationen"); var vehiclesItem = new UIMenuItem("Fahrzeuge", "Zeige deine Fahrzeuge an"); @@ -337,25 +337,25 @@ export default function (globalData: IGlobalData) { return 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); - factionMenu.AddItem(new UIMenuItem("Ticket annehmen")); - factionMenu.AddItem(new UIMenuItem("Ticket ablehnen")); - factionMenu.Visible = false; + var ticketMenu = new NativeUI.Menu("Ticket", `Ticket in Höhe von ${ticket_amount}$`, new Point(50, 50), null, null); + ticketMenu.AddItem(new UIMenuItem("Ticket annehmen")); + ticketMenu.AddItem(new UIMenuItem("Ticket ablehnen")); + ticketMenu.Visible = false; - factionMenu.ItemSelect.on((item, index) => { + ticketMenu.ItemSelect.on((item, index) => { if (index === 0) // Ticket annehmen { - parentMenu.Close(); mp.events.callRemote("CLIENT:InteractionMenu_Ticket", "Angenommen", ticket_amount); + parentMenu.Close(true); } else if (index === 1) // Ticket ablehnen { - parentMenu.Close(); mp.events.callRemote("CLIENT:InteractionMenu_Ticket", "Abgelehnt", ticket_amount); + parentMenu.Close(true); } }); - return factionMenu; + return ticketMenu; } } diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index fdd21244..8e974f1c 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -106,6 +106,10 @@ namespace ReallifeGamemode.Server.Events case 2: player.TriggerEvent("showFactionInteractionMedic", user.FactionId, user.GetData("duty"), user.Faction.Name, user.FactionLeader, Medic.ReviveTasks.Count.ToString(), Medic.HealTasks.Count.ToString(), Medic.FireTasks.Count.ToString()); break; + //FIB + case 3: + player.TriggerEvent("showFactionInteractionLSPD", user.FactionId, user.GetData("duty"), user.Faction.Name, user.FactionLeader); + break; } } diff --git a/ReallifeGamemode.Server/Managers/InteractionManager.cs b/ReallifeGamemode.Server/Managers/InteractionManager.cs index e5756cd8..6dfb2d6f 100644 --- a/ReallifeGamemode.Server/Managers/InteractionManager.cs +++ b/ReallifeGamemode.Server/Managers/InteractionManager.cs @@ -524,16 +524,17 @@ namespace ReallifeGamemode.Server.Managers dbContext.SaveChanges(); } target.ResetData("ticket_boolean"); - NAPI.Data.ResetEntityData(target, "ticket_amount"); - NAPI.Data.ResetEntityData(target, "ticket_player"); + target.ResetData("ticket_amount"); + target.ResetData("ticket_player"); + } else if (type == "Abgelehnt") { 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); target.ResetData("ticket_boolean"); - NAPI.Data.ResetEntityData(target, "ticket_amount"); - NAPI.Data.ResetEntityData(target, "ticket_player"); + target.ResetData("ticket_amount"); + target.ResetData("ticket_player"); } } #endregion