aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hotfix/luke' into 'master'

Browse Source 
hab die kirschen gepflückt

See merge request log-gtav/reallife-gamemode!72
This commit is contained in:
hydrant
2021-05-22 11:20:39 +00:00
parent 4f458e9ab3 6a958d77cd
commit 8c964dc026
8 changed files with 23 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ReallifeGamemode.Client/FactionManagement/main.ts
View File

@@ -12,7 +12,6 @@ export default function factionManagement() {
mp.events.add('manageFactionRanks', (ranks) => { mp.events.add('manageFactionRanks', (ranks) => {
if (manageFactionRanksBrowser !== null) return; if (manageFactionRanksBrowser !== null) return;
manageFactionRanksBrowser = mp.browsers.new('package://assets/html/factionmanagement/ranks/index.html'); manageFactionRanksBrowser = mp.browsers.new('package://assets/html/factionmanagement/ranks/index.html');
mp.gui.chat.activate(false); mp.gui.chat.activate(false);
rankData = JSON.parse(ranks); rankData = JSON.parse(ranks);
}); });
@@ -22,6 +21,7 @@ export default function factionManagement() {
manageFactionRanksBrowser.execute(`setFactionName('${rankData.FactionName}')`); manageFactionRanksBrowser.execute(`setFactionName('${rankData.FactionName}')`);
manageFactionRanksBrowser.execute(`loadData(` + JSON.stringify(rankData.Ranks) + `)`); manageFactionRanksBrowser.execute(`loadData(` + JSON.stringify(rankData.Ranks) + `)`);
mp.gui.cursor.show(true, true); mp.gui.cursor.show(true, true);
this.data.InMenu = true;
} }
}); });
@@ -30,6 +30,7 @@ export default function factionManagement() {
manageFactionRanksBrowser.destroy(); manageFactionRanksBrowser.destroy();
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
this.data.InMenu = false;
var obj: FactionRanks = { var obj: FactionRanks = {
factionId: rankData.FactionId, factionId: rankData.FactionId,

2
ReallifeGamemode.Client/Gui/blips.ts
View File

@@ -72,7 +72,7 @@ export default function playerBlips() {
} }
mp.events.callRemote("CLIENT:EscapeWanted"); mp.events.callRemote("CLIENT:EscapeWanted");
}, 300000); //120000 -> 2 min , 300000 -> 5min }, 2.4 * 60 * 1000); // 2.4 Minuten
} }
}, 50); }, 50);

15
ReallifeGamemode.Client/assets/html/factionmanagement/ranks/index.html
View File

@@ -6,14 +6,16 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="de" xmlns="http://www.w3.org/1999/xhtml"> <html lang="de" xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title></title> <title></title>
<link rel="stylesheet" href="../../css/factionmanagement/ranks/style.css" /> <link rel="stylesheet" href="../../../css/factionmanagement/ranks/style.css" />
</head> </head>
<body> <body>
<div class="table"> <div class="table">
<h2><span id="faction-name"></span>: Ränge bearbeiten</h2> <h2><span id="faction-name">{{ name }}</span>: Ränge bearbeiten</h2>
<table id="rank-table"></table> <table id="rank-table"></table>
<div class="add-rank"> <div class="add-rank">
<input id="input-new-rank" placeholder="Neuer Rang" /> <input id="input-new-rank" placeholder="Neuer Rang" />
@@ -22,9 +24,10 @@
<button class="save-btn">Speichern</button> <button class="save-btn">Speichern</button>
</div> </div>
<script src="../../js/jquery-3.3.1.min.js"></script> <script src="../../../js/jquery-3.3.1.min.js"></script>
<script src="../../js/jquery.tablednd.0.8.min.js"></script> <script src="../../../js/jquery.tablednd.0.8.min.js"></script>
<script src="../../js/jquery.gettable.js"></script> <script src="../../../js/jquery.gettable.js"></script>
<script src="../../js/factionmanagement/ranks/script.js"></script> <script src="../../../js/factionmanagement/ranks/script.js"></script>
</body> </body>
</html> </html>

3
ReallifeGamemode.Client/inputhelper/index.ts
View File

@@ -30,7 +30,6 @@ export default class InputHelper {
show() { show() {
if (this.created) return; if (this.created) return;
this.data.InMenu = true;
this.created = true; this.created = true;
this.browser = mp.browsers.new('package://assets/html/inputhelper/index.html'); this.browser = mp.browsers.new('package://assets/html/inputhelper/index.html');
mp.gui.cursor.show(true, true); mp.gui.cursor.show(true, true);
@@ -44,11 +43,9 @@ export default class InputHelper {
mp.events.remove('cef_request_title'); mp.events.remove('cef_request_title');
mp.events.remove('closeinputhelper'); mp.events.remove('closeinputhelper');
this.browser.destroy(); this.browser.destroy();
this.data.InMenu = false;
this.created = false; this.created = false;
this.browser = null; this.browser = null;
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
} }
} }

4
ReallifeGamemode.Server/Commands/AdminCommands.cs
View File

@@ -1645,7 +1645,7 @@ namespace ReallifeGamemode.Server.Commands
public void CmdAdminUnshow(Player player) public void CmdAdminUnshow(Player player)
{ {
User user = player.GetUser(); User user = player.GetUser();
if (!user.IsAdmin(AdminLevel.HEADADMIN)) if (!user.IsAdmin(AdminLevel.ADMIN))
{ {
ChatService.NotAuthorized(player); ChatService.NotAuthorized(player);
return; return;
@@ -3945,7 +3945,7 @@ namespace ReallifeGamemode.Server.Commands
[RemoteEvent("Noclip")] [RemoteEvent("Noclip")]
public void Noclip(Player player) public void Noclip(Player player)
{ {
if (!player.GetUser().IsAdmin(AdminLevel.HEADADMIN)) if (!player.GetUser().IsAdmin(AdminLevel.ADMIN))
{ {
return; return;
} }

6
ReallifeGamemode.Server/Events/Key.cs
View File

@@ -312,7 +312,7 @@ namespace ReallifeGamemode.Server.Events
if (user.GetData<bool>("duty") == false) if (user.GetData<bool>("duty") == false)
{ {
user.SetData("duty", true); 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("toggleDutyMode", true);
player.TriggerEvent("abortSpawnschutz"); player.TriggerEvent("abortSpawnschutz");
if (user.FactionId == 2) //Fire Department if (user.FactionId == 2) //Fire Department
@@ -353,7 +353,7 @@ namespace ReallifeGamemode.Server.Events
else else
{ {
user.SetData("duty", false); 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); player.TriggerEvent("toggleDutyMode", false);
Medic.UpdateDutyMedics(); Medic.UpdateDutyMedics();
UpdateCharacterCloth.LoadCharacterDefaults(player); 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); 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; 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; unloadedWeaponPackage = true;
context.Remove(item); context.Remove(item);
} }

2
ReallifeGamemode.Server/Util/GlobalHelper.cs
View File

@@ -14,7 +14,7 @@ namespace ReallifeGamemode.Server.Util
{ ".MichaPlays.", "Der echte Ballas Leader ist online (MichaPlays)" }, { ".MichaPlays.", "Der echte Ballas Leader ist online (MichaPlays)" },
{ "iCroniX", "Life of Malle - Eimer für Alle - Alle für Malle - Böllern! (CroniX)" }, { "iCroniX", "Life of Malle - Eimer für Alle - Alle für Malle - Böllern! (CroniX)" },
{ "balboistderbeste", "Hurra! Hurra! Der Balbo ist jetzt da! (balbo)" }, { "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)" }, { "raviatex", "I'll remember you all in therapy. (aviate)" },
{ "datgame__", "KOPF ENTWICKLUNG!! (hydrant)" }, { "datgame__", "KOPF ENTWICKLUNG!! (hydrant)" },
{ "Roachkook", "2head Entwickler ist wieder online (kookroach)" } { "Roachkook", "2head Entwickler ist wieder online (kookroach)" }

17
ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs
View File

@@ -128,9 +128,9 @@ namespace ReallifeGamemode.Server.WeaponDeal
msg = "Die Waffenlieferung steht zur Abholung bereit"; 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); fVeh.SetData("weaponDeal", true);
InventoryManager.RemoveAllItemsfromVehicleInventory(fVeh); InventoryManager.RemoveAllItemsfromVehicleInventory(fVeh);
Faction fac = context.Factions.Where(f => f.Id == user.FactionId).FirstOrDefault(); 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() public static void Timer_Elapsed()
{ {
using (var context = new DatabaseContext()) using (var context = new DatabaseContext())
@@ -259,8 +250,8 @@ namespace ReallifeGamemode.Server.WeaponDeal
InventoryManager.AddItemToVehicleInventory(fVeh, item7.ItemId, item7.Amount); InventoryManager.AddItemToVehicleInventory(fVeh, item7.ItemId, item7.Amount);
} }
ChatService.BroadcastFaction("~y~[WAFFENDEAL] ~w~Der Transporter wurde erfolgreich beladen.", new List<int>() { client.GetUser().Faction.Id }); ChatService.BroadcastFaction("~y~[WT] ~w~Der Transporter wurde erfolgreich beladen.", new List<int>() { client.GetUser().Faction.Id });
client.SendChatMessage("~y~[WAFFENDEAL] ~w~Fahre nun zu deiner Base zurück."); client.SendChatMessage("~y~[WT] ~w~Fahre nun zu deiner Base zurück.");
BasePoints basePoints = new BasePoints(); BasePoints basePoints = new BasePoints();
basePoints.getbase(user.FactionId, client); basePoints.getbase(user.FactionId, client);
} }