From c5e6a80ed2e606f99471dc2d35eead2ce03f2413 Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Fri, 26 Mar 2021 18:34:01 +0100 Subject: [PATCH] testen ob blips auf map so gehen --- ReallifeGamemode.Client/Gui/blips.ts | 2 +- ReallifeGamemode.Server/Commands/FactionCommands.cs | 13 ++++++++++++- ReallifeGamemode.Server/Commands/UserCommands.cs | 12 ++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/ReallifeGamemode.Client/Gui/blips.ts b/ReallifeGamemode.Client/Gui/blips.ts index 5809ce1f..00f1e493 100644 --- a/ReallifeGamemode.Client/Gui/blips.ts +++ b/ReallifeGamemode.Client/Gui/blips.ts @@ -13,7 +13,7 @@ export default function playerBlips() { entity.setBlipColor(isNaN(color) ? 0 : color); mp.game.invoke(Natives.SET_BLIP_CATEGORY, entity.blip, 7); mp.game.invoke(Natives.SHOW_HEADING_INDICATOR_ON_BLIP, entity.blip, true); - mp.game.invoke(Natives.SET_BLIP_AS_SHORT_RANGE, entity.blip, true); + //mp.game.invoke(Natives.SET_BLIP_AS_SHORT_RANGE, entity.blip, true); mp.game.invoke(Natives.SET_BLIP_DISPLAY, entity.blip, 8); } }); diff --git a/ReallifeGamemode.Server/Commands/FactionCommands.cs b/ReallifeGamemode.Server/Commands/FactionCommands.cs index 10c7ab4a..bb926630 100644 --- a/ReallifeGamemode.Server/Commands/FactionCommands.cs +++ b/ReallifeGamemode.Server/Commands/FactionCommands.cs @@ -474,7 +474,18 @@ namespace ReallifeGamemode.Server.Commands } #endregion Staatsfraktionen (LSPD / FBI) Commands + #region Weazel News + [Command("eventchat", "~m~Benutzung: ~s~/eventchat [Typ = ~g~on~s~, ~g~off~s~", GreedyArg = true)] + public void CmdFactionNREventchat(Player player, string onoff) + { + + List players = NAPI.Pools.GetAllPlayers(); + + + } + + + #endregion Weazel News } - } diff --git a/ReallifeGamemode.Server/Commands/UserCommands.cs b/ReallifeGamemode.Server/Commands/UserCommands.cs index 18e7275f..9b95e21c 100644 --- a/ReallifeGamemode.Server/Commands/UserCommands.cs +++ b/ReallifeGamemode.Server/Commands/UserCommands.cs @@ -87,6 +87,18 @@ namespace ReallifeGamemode.Server.Commands { player.PlayAnimation("mp_am_hold_up", "handsup_base", (int)(AnimationFlags.Loop | AnimationFlags.OnlyAnimateUpperBody | AnimationFlags.AllowPlayerControl | AnimationFlags.Cancellable)); } + + [Command("event", "~m~Benutzung: ~s~/eventchat [Nachricht]", GreedyArg = true)] + public void CmdFactionNREventchat(Player player, string msg) + { + if (player.HasData("eventAllowed") == false) + { + ChatService.NotAuthorized(player); + return; + } + ChatService.BroadcastFaction(msg, new List() { 9 }) ; + + } } }