diff --git a/ReallifeGamemode.Client/Interaction/interactionmenu.ts b/ReallifeGamemode.Client/Interaction/interactionmenu.ts index 041649b6..31f60775 100644 --- a/ReallifeGamemode.Client/Interaction/interactionmenu.ts +++ b/ReallifeGamemode.Client/Interaction/interactionmenu.ts @@ -112,6 +112,10 @@ export default function (globalData: IGlobalData) { menu.BindMenuToItem(paycheckMenu, paycheckItem); } + var nextPaydayItem = new UIMenuItem("Nächster PayDay"); + nextPaydayItem.SetRightLabel(`${accountData.nextPayday} Minuten`); + menu.AddItem(nextPaydayItem); + if (ticket_boolean == true) { menu.AddItem(ticketItem); menu.BindMenuToItem(getTicketMenu(ticket_amount, menu), ticketItem); diff --git a/ReallifeGamemode.Client/global.d.ts b/ReallifeGamemode.Client/global.d.ts index 13ba2478..9bc07c6e 100644 --- a/ReallifeGamemode.Client/global.d.ts +++ b/ReallifeGamemode.Client/global.d.ts @@ -19,6 +19,7 @@ declare type AccountData = { paycheck: Paycheck; licenses: Licenses; vehicles: VehicleData[]; + nextPayday: number; } declare type VehicleData = { diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index 8e974f1c..8dedf985 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -143,7 +143,8 @@ namespace ReallifeGamemode.Server.Events job = JobManager.GetJob(u.JobId ?? 0)?.Name ?? "Keiner", paycheck, licenses, - vehicles + vehicles, + nextPayday = u.PaydayTimer }; string faction = u.FactionLeader ? u.Faction.Name : null; @@ -154,7 +155,7 @@ namespace ReallifeGamemode.Server.Events int ticket_amount = 0; if (player.HasData("ticket_amount")) { - ticket_amount = player.GetData("ticket_amount"); + ticket_amount = player.GetData("ticket_amount"); } player.TriggerEvent("SERVER:InteractionMenu_OpenMenu", JsonConvert.SerializeObject(accountData), faction, group, factionInvite, groupInvite, ticket_boolean, ticket_amount);