diff --git a/ReallifeGamemode.Client/Player/keys.ts b/ReallifeGamemode.Client/Player/keys.ts index 0bc03166..dd10ffd7 100644 --- a/ReallifeGamemode.Client/Player/keys.ts +++ b/ReallifeGamemode.Client/Player/keys.ts @@ -44,9 +44,9 @@ export default function keys(globalData: IGlobalData) { }); //DOWN ARROW (Eigeninteraktion) - mp.keys.bind(0x28, false, function () { + mp.keys.bind(0x4D, false, function () { if (!globalData.InChat && !showInv && !globalData.InMenu && !globalData.InInput && !globalData.InTuning) { - mp.events.callRemote("keyPress:DOWN_ARROW"); + mp.events.callRemote("keyPress:M"); } }); //F7 //Unshowalles diff --git a/ReallifeGamemode.Server.Core/Menus/PoliceDepartment.cs b/ReallifeGamemode.Server.Core/Menus/PoliceDepartment.cs index cc12515e..5ab97028 100644 --- a/ReallifeGamemode.Server.Core/Menus/PoliceDepartment.cs +++ b/ReallifeGamemode.Server.Core/Menus/PoliceDepartment.cs @@ -5,6 +5,7 @@ using ReallifeGamemode.Server.Core.API; using ReallifeGamemode.Server.Types; using ReallifeGamemode.Server.Core.Extensions; + namespace ReallifeGamemode.Server.Core.Menus { internal class PoliceDepartment : Script diff --git a/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs b/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs index 9f5be53d..c44e3aaf 100644 --- a/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs +++ b/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using GTANetworkAPI; using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Models; @@ -108,14 +108,16 @@ namespace ReallifeGamemode.Server.DrivingSchool [RemoteEvent("startDrivingSchool")] public void StartDrivingSchool(Player client) - { + { User user = client.GetUser(); if (user.DriverLicenseVehicle || client.HasData("ActiveSchool")) + { + client.SendChatMessage("~b~[INFO]~s~ Du besitzt schon einen Führerschein."); return; - + } if (user.Handmoney < 2500) { - client.SendNotification("~r~Du brauchst ~g~$2500~r~ auf der Hand um die Prüfung zu starten.", true); + client.SendNotification("~r~[FEHLER]~s~ Du hast nicht genug Geld auf der Hand($2.500)!", true); return; } @@ -205,11 +207,13 @@ namespace ReallifeGamemode.Server.DrivingSchool { User user = client.GetUser(); if (user.DriverLicenseBike || client.HasData("ActiveSchool")) + { + client.SendChatMessage("~b~[INFO]~s~ Du besitzt schon einen Motorradschein."); return; - + } if (user.Handmoney < 3500) { - client.SendNotification("~r~Du brauchst ~g~$3500~r~ auf der Hand um die Prüfung zu starten.", true); + client.SendNotification("~r~[FEHLER]~s~Du hast nicht genug Geld auf der Hand($3.500)!", true); return; } diff --git a/ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs b/ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs index b86702a0..856107e3 100644 --- a/ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs +++ b/ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using GTANetworkAPI; using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Models; @@ -68,8 +68,10 @@ namespace ReallifeGamemode.Server.DrivingSchool User user = client.GetUser(); if (user.FlyingLicensePlane || client.HasData("ActiveSchool")) + { + client.SendChatMessage("~b~[INFO]~s~ Du besitzt schon einen Flugschein."); return; - + } if (user.Handmoney < 5000) { client.SendNotification("~r~Du brauchst ~g~$5000~r~ auf der Hand um die Prüfung zu starten.", true); diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index 50f8366d..1ca9bbe1 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -119,8 +119,8 @@ namespace ReallifeGamemode.Server.Events } } - [RemoteEvent("keyPress:DOWN_ARROW")] - public void KeyPressDownArrow(Player player) + [RemoteEvent("keyPress:M")] + public void KeyPressM(Player player) { using var dbContext = new DatabaseContext(); User u = player.GetUser(dbContext); @@ -159,7 +159,7 @@ namespace ReallifeGamemode.Server.Events paycheck, licenses, vehicles, - factionVehicles = u.FactionLeader ? factionVehicles : null, + factionVehicles, nextPayday = u.PaydayTimer }; diff --git a/ReallifeGamemode.Server/Managers/InteractionManager.cs b/ReallifeGamemode.Server/Managers/InteractionManager.cs index 2cd754dd..4cb9e701 100644 --- a/ReallifeGamemode.Server/Managers/InteractionManager.cs +++ b/ReallifeGamemode.Server/Managers/InteractionManager.cs @@ -25,7 +25,7 @@ namespace ReallifeGamemode.Server.Managers { public class InteractionManager : Script { - #region Eigeninteraktionen PFEILTASTE-RUNTER + #region Eigeninteraktionen Taste-M [RemoteEvent("CLIENT:InteractionMenu_AcceptInvite")] public void InteractionMenuAcceptInvite(Player player, string type)