-
: Ränge bearbeiten
+
{{ name }}: Ränge bearbeiten
@@ -22,9 +24,10 @@
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/ReallifeGamemode.Client/inputhelper/index.ts b/ReallifeGamemode.Client/inputhelper/index.ts
index 62e509ae..6297caab 100644
--- a/ReallifeGamemode.Client/inputhelper/index.ts
+++ b/ReallifeGamemode.Client/inputhelper/index.ts
@@ -29,8 +29,7 @@ export default class InputHelper {
}
show() {
- if (this.created) return;
- this.data.InMenu = true;
+ if (this.created) return;
this.created = true;
this.browser = mp.browsers.new('package://assets/html/inputhelper/index.html');
mp.gui.cursor.show(true, true);
@@ -44,11 +43,9 @@ export default class InputHelper {
mp.events.remove('cef_request_title');
mp.events.remove('closeinputhelper');
this.browser.destroy();
- this.data.InMenu = false;
this.created = false;
this.browser = null;
mp.gui.cursor.show(false, false);
-
}
}
diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs
index ff993e82..3da213f2 100644
--- a/ReallifeGamemode.Server/Commands/AdminCommands.cs
+++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs
@@ -1645,7 +1645,7 @@ namespace ReallifeGamemode.Server.Commands
public void CmdAdminUnshow(Player player)
{
User user = player.GetUser();
- if (!user.IsAdmin(AdminLevel.HEADADMIN))
+ if (!user.IsAdmin(AdminLevel.ADMIN))
{
ChatService.NotAuthorized(player);
return;
@@ -3945,7 +3945,7 @@ namespace ReallifeGamemode.Server.Commands
[RemoteEvent("Noclip")]
public void Noclip(Player player)
{
- if (!player.GetUser().IsAdmin(AdminLevel.HEADADMIN))
+ if (!player.GetUser().IsAdmin(AdminLevel.ADMIN))
{
return;
}
diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs
index bc347c28..c41554ca 100644
--- a/ReallifeGamemode.Server/Events/Key.cs
+++ b/ReallifeGamemode.Server/Events/Key.cs
@@ -312,7 +312,7 @@ namespace ReallifeGamemode.Server.Events
if (user.GetData
("duty") == false)
{
user.SetData("duty", true);
- player.SendNotification("Du bist nun ~g~im Dienst.");
+ player.SendNotification("Du bist nun ~g~im Dienst");
player.TriggerEvent("toggleDutyMode", true);
player.TriggerEvent("abortSpawnschutz");
if (user.FactionId == 2) //Fire Department
@@ -353,7 +353,7 @@ namespace ReallifeGamemode.Server.Events
else
{
user.SetData("duty", false);
- player.SendNotification("Du bist nun ~r~außer Dienst.");
+ player.SendNotification("Du bist nun ~r~nicht mehr im Dienst");
player.TriggerEvent("toggleDutyMode", false);
Medic.UpdateDutyMedics();
UpdateCharacterCloth.LoadCharacterDefaults(player);
@@ -401,7 +401,7 @@ namespace ReallifeGamemode.Server.Events
logger.LogInformation("Player {0} put the weapon deal item \"{1}\" (amount: {2}) in weapon rack of faction {3}", player.Name, weapon.WeaponModel, item.Amount, user.FactionId);
weapon.Ammount += item.Amount;
- ChatService.SendMessage(player, item.Amount + " " + iItem.Name + " wurden im Waffenlager hinzugefügt.");
+ ChatService.SendMessage(player, $"~y~[WT] ~s~Du hast eine ~y~Kiste abgeladen ~s~(Inhalt: {item.Amount}x {iItem.Name}).");
unloadedWeaponPackage = true;
context.Remove(item);
}
diff --git a/ReallifeGamemode.Server/Util/GlobalHelper.cs b/ReallifeGamemode.Server/Util/GlobalHelper.cs
index 88e0a5e3..94849ec3 100644
--- a/ReallifeGamemode.Server/Util/GlobalHelper.cs
+++ b/ReallifeGamemode.Server/Util/GlobalHelper.cs
@@ -14,7 +14,7 @@ namespace ReallifeGamemode.Server.Util
{ ".MichaPlays.", "Der echte Ballas Leader ist online (MichaPlays)" },
{ "iCroniX", "Life of Malle - Eimer für Alle - Alle für Malle - Böllern! (CroniX)" },
{ "balboistderbeste", "Hurra! Hurra! Der Balbo ist jetzt da! (balbo)" },
- { "AirMake", "The fresh breeze of the stone ist back. (AirMake)" },
+ { "AirMake", "The fresh breeze of the stone is back. (AirMake)" },
{ "raviatex", "I'll remember you all in therapy. (aviate)" },
{ "datgame__", "KOPF ENTWICKLUNG!! (hydrant)" },
{ "Roachkook", "2head Entwickler ist wieder online (kookroach)" }
diff --git a/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs b/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs
index 8cfaae03..14dd9af6 100644
--- a/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs
+++ b/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs
@@ -128,9 +128,9 @@ namespace ReallifeGamemode.Server.WeaponDeal
msg = "Die Waffenlieferung steht zur Abholung bereit";
}
- ChatService.BroadcastFaction($"~y~[WAFFENDEAL]~s~ {msg}.", user.Faction);
+ ChatService.BroadcastFaction($"~y~[WT]~s~ {msg}.", user.Faction);
- ChatService.SendMessage(client, "~y~[WAFFENDEAL]~s~ Steige in den ~y~Transporter ~s~ein und fahre zum Übergabepunkt.");
+ ChatService.SendMessage(client, "~y~[WT]~s~ Steig in den ~y~Transporter ~s~ein und fahre zum Übergabepunkt.");
fVeh.SetData("weaponDeal", true);
InventoryManager.RemoveAllItemsfromVehicleInventory(fVeh);
Faction fac = context.Factions.Where(f => f.Id == user.FactionId).FirstOrDefault();
@@ -147,15 +147,6 @@ namespace ReallifeGamemode.Server.WeaponDeal
}
}
- /*
- public static void WeaponDealTimer()
- {
- System.Timers.Timer timer = new System.Timers.Timer(60000);
- timer.Start();
- timer.Elapsed += Timer_Elapsed;
- }
- */
-
public static void Timer_Elapsed()
{
using (var context = new DatabaseContext())
@@ -259,8 +250,8 @@ namespace ReallifeGamemode.Server.WeaponDeal
InventoryManager.AddItemToVehicleInventory(fVeh, item7.ItemId, item7.Amount);
}
- ChatService.BroadcastFaction("~y~[WAFFENDEAL] ~w~Der Transporter wurde erfolgreich beladen.", new List() { client.GetUser().Faction.Id });
- client.SendChatMessage("~y~[WAFFENDEAL] ~w~Fahre nun zu deiner Base zurück.");
+ ChatService.BroadcastFaction("~y~[WT] ~w~Der Transporter wurde erfolgreich beladen.", new List() { client.GetUser().Faction.Id });
+ client.SendChatMessage("~y~[WT] ~w~Fahre nun zu deiner Base zurück.");
BasePoints basePoints = new BasePoints();
basePoints.getbase(user.FactionId, client);
}