diff --git a/Client/Gui/Inventory/inventory.js b/Client/Gui/Inventory/inventory.js index ee6f608b..47e58c52 100644 --- a/Client/Gui/Inventory/inventory.js +++ b/Client/Gui/Inventory/inventory.js @@ -1,4 +1,5 @@ var show = false; +var showAdmin = false; var trading = false; const { x: screenX, y: screenY } = mp.game.graphics.getScreenActiveResolution(0, 0); let rxC = 0.5; @@ -10,6 +11,8 @@ let eX = sX - 0.1; let eY = sY - 0.1; let sizeMul = 0.08; let yMul = 1.8; +var targetPlayerName; +let closePos = [0.7125, 0.17] var inventoryWeight; var items = [[]]; @@ -47,7 +50,8 @@ var stackToItem; mp.events.add("showInventory", (invWeight, itemArr) => { if (show === false) { - mp.gui.chat.activate(false); + //mp.gui.chat.activate(false); + setInterval() mp.gui.cursor.show(true, true); inventoryWeight = invWeight; items = itemArr; @@ -59,11 +63,49 @@ mp.events.add("showInventory", (invWeight, itemArr) => { mp.gui.cursor.show(false, false); show = false; mp.game.graphics.setStreamedTextureDictAsNoLongerNeeded("itemimages"); + inventoryWeight = 0; + items = null; + } +}); + +mp.events.add("showInventoryToAdmin", (pName, invWeight, itemArr) => { + if (showAdmin === false) { + targetPlayerName = pName; + mp.gui.chat.activate(false); + inventoryWeight = invWeight; + items = itemArr; + mp.game.graphics.requestStreamedTextureDict("itemimages", true); + setTimeout(() => mp.gui.cursor.show(true, true), 100); + showAdmin = true; } }); mp.events.add("addItem", (item) => { - items.push(item); + if (show) { + items.push(JSON.parse(item)); + } +}); + +mp.events.add("removeItem", (userItemId, amount) => { + if (show) { + var arrIndex; + for (var i = 0; i < items.length; i++) { + if (items[i][5] === userItemId) { + arrIndex = i; + } + } + if (amount === "stack") { + items[arrIndex][4] = "-1"; + inventoryWeight -= parseInt(items[arrIndex][2]) * parseInt(items[arrIndex][3]); + items.splice(arrIndex, 1); + } else if (amount === "one") { + items[arrIndex][3]--; + inventoryWeight -= items[arrIndex][2]; + if (items[arrIndex][3] === 0) { + items.splice(arrIndex, 1); + } + } + } }); mp.events.add("render", () => { @@ -150,7 +192,87 @@ mp.events.add("render", () => { } } - } + } + if (showAdmin === true) { + var pos = mp.gui.cursor.position; + + mp.game.graphics.set2dLayer(1); + //INVENTARHINTERGRUND + mp.game.graphics.drawRect(rxC, ryC, 0.45, 0.7, 255, 255, 255, 200); + + mp.game.graphics.set2dLayer(2); + //INVENTARÜBERSCHRIFT + mp.game.graphics.drawText("Inventar von ~y~" + targetPlayerName + " ~g~(" + inventoryWeight + "/40000g)", [rxC, ryC - (rWidth / 1.20)], { + font: 7, + color: [112, 128, 144, 254], + scale: [0.7, 0.7], + outline: true, + }); + + //SLOTS [RECHTECKE] [SLOTZAHLEN] + var tempSlot; + for (var slots = 0; slots < grid.length; slots++) { + mp.game.graphics.drawRect(grid[slots][0], grid[slots][1], sizeMul, sizeMul * yMul, 112, 128, 144, 254); + mp.game.graphics.drawText(tempSlot = slots + 1, [grid[slots][0] - (sizeMul / 2) + 0.006, grid[slots][1] - (sizeMul / 2 * yMul)], { + font: 7, + color: [255, 69, 0, 254], + scale: [0.3, 0.3], + outline: true, + }); + } + + mp.game.graphics.set2dLayer(3); + //SPRITES + ITEMANZAHL + for (var currentItem = 0; currentItem < items.length; currentItem++) { + if (items[currentItem][4] !== "-1") { + mp.game.graphics.drawSprite("itemimages", items[currentItem][0].toLowerCase(), grid[parseInt(items[currentItem][4] - 1)][0], grid[parseInt(items[currentItem][4] - 1)][1], rWidth / 8, rWidth / 5, 0, 255, 255, 255, 255); + mp.game.graphics.drawText("(~y~" + items[currentItem][3] + "~s~)", [grid[parseInt(items[currentItem][4] - 1)][0] + (sizeMul / 2) - 0.008, grid[parseInt(items[currentItem][4] - 1)][1] + 0.05], { + font: 0, + color: [255, 255, 255, 255], + scale: [0.25, 0.25], + outline: true, + }); + } + } + + mp.game.graphics.set2dLayer(4); + //WENN MAUS ÜBER ITEM + if (isMouseOverItem(pos[0], pos[1]) && dragItem === null) { + mp.game.graphics.drawRect(pos[0] / screenX, pos[1] / screenY + 0.055, 0.14, 0.08, 0, 0, 0, 220); + + var hoverItemP = [items[hoverItem][0], items[hoverItem][1], items[hoverItem][2], items[hoverItem][3]]; + + //NAME + mp.game.graphics.drawText("~g~" + hoverItemP[0], [pos[0] / screenX, pos[1] / screenY + 0.02], { + font: 4, + color: [255, 255, 255, 255], + scale: [0.4, 0.4], + outline: true, + }); + + //BESCHREIBUNG + mp.game.graphics.drawText(hoverItemP[1], [pos[0] / screenX, pos[1] / screenY + 0.04], { + font: 4, + color: [255, 255, 255, 255], + scale: [0.35, 0.35], + outline: true, + }); + + //EINZELGEWICHT + mp.game.graphics.drawText("~y~" + hoverItemP[2] + "g~s~ * " + hoverItemP[3] + "~s~ = ~y~" + hoverItemP[2] * hoverItemP[3] + "g", [pos[0] / screenX, pos[1] / screenY + 0.06], { + font: 4, + color: [255, 255, 255, 255], + scale: [0.35, 0.35], + outline: true, + }); + } + if (isMouseOverX(pos[0], pos[1])) { + mp.game.graphics.drawSprite("itemimages", "x", closePos[0], closePos[1], 0.02, 0.035, 0, 220, 20, 60, 255); + } else { + mp.game.graphics.drawSprite("itemimages", "x", closePos[0], closePos[1], 0.02, 0.035, 0, 255, 255, 255, 255); + } + + } }); function isMouseOverItem(cX, cY) { @@ -242,6 +364,23 @@ function isItemOverSameItem(cX2, cY2) { } } +function isMouseOverX(cX2, cY2) { + if (showAdmin) { + var x = cX2 / screenX; + var y = cY2 / screenY; + var a; + var b; + var c; + + a = closePos[0] - x; + b = closePos[1] - y; + c = Math.sqrt(a * a + b * b); + if (c < 0.018) { + return true; + } + } +} + mp.events.add('click', (x, y, upOrDown, leftOrRight, relativeX, relativeY, worldPosition, hitEntity) => { var cX = x / screenX; @@ -330,5 +469,42 @@ mp.events.add('click', (x, y, upOrDown, leftOrRight, relativeX, relativeY, world } } } - } + } + if (showAdmin) { + //LINKE MAUSTASTE + //RUNTER + if (upOrDown === "down" && leftOrRight === "left" && mouseLDown === false && mouseRDown === false) { + + if (isMouseOverItem(x, y)) { + items[hoverItem][4] = "-1" + inventoryWeight -= parseInt(items[hoverItem][2]) * parseInt(items[hoverItem][3]); + mp.events.callRemote('removeItemAsAdmin', "stack", items[hoverItem][5], targetPlayerName); + } + } + + //RECHTE MAUSTASTEshowAdmin = true; + //RUNTER + if (upOrDown === "down" && leftOrRight === "right" && mouseLDown === false && mouseRDown === false) { + + if (isMouseOverItem(x, y)) { + items[hoverItem][3]--; + mp.events.callRemote('removeItemAsAdmin', "one", items[hoverItem][5], targetPlayerName); + if (items[hoverItem][3] === 0) { + items[hoverItem][4] = "-1"; + } + inventoryWeight -= items[hoverItem][2]; + } + } + if (upOrDown === "down" && leftOrRight === "left" && mouseLDown === false && mouseRDown === false) { + + if (isMouseOverX(x, y)) { + mp.gui.chat.activate(true); + mp.gui.cursor.show(false, false); + showAdmin = false; + mp.game.graphics.setStreamedTextureDictAsNoLongerNeeded("itemimages"); + inventoryWeight = 0; + items = null; + } + } + } }); \ No newline at end of file diff --git a/Client/dlcpacks/itemimages/dlc.rpf b/Client/dlcpacks/itemimages/dlc.rpf index d05c6a2a..2f4a83f5 100644 --- a/Client/dlcpacks/itemimages/dlc.rpf +++ b/Client/dlcpacks/itemimages/dlc.rpf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dcf279344c11eb9eac1801e56e6fa11172e577ff415363338c5f38d2d1152b31 -size 33792 +oid sha256:df4d09a306cb10b002168a863f3b4c43554350c6eb64c9e5707513b249d5b03c +size 34304 diff --git a/Server/Commands/Admin.cs b/Server/Commands/Admin.cs index 1fdf724d..35513982 100644 --- a/Server/Commands/Admin.cs +++ b/Server/Commands/Admin.cs @@ -61,43 +61,7 @@ namespace reallife_gamemode.Server.Commands usableItemObj.Use(eatItem, player); } } - [Command("myitems")] - public void CmdAdminMyItems(Client player) - { - if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true) - { - ChatService.NotAuthorized(player); - return; - } - - List itemList = player.GetUser().GetItems(); - - foreach (var item in itemList) - { - IItem iitem = InventoryManager.GetItemById(item.ItemId); - player.SendChatMessage("Item: ~g~" + item.Amount + " " + iitem.Name); - } - } - - [Command("giveitem", "~m~Benutzung: ~s~/giveitem [Target] [Item ID] [Anzahl]")] - public void CmdAdminGiveItem(Client player, string targetname, int itemId, int amount) - { - if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true) - { - ChatService.NotAuthorized(player); - return; - } - - Client target = ClientService.GetClientByNameOrId(targetname); - if (target == null || !target.IsLoggedIn()) - { - ChatService.PlayerNotFound(player); - return; - } - - UserItem item = new UserItem() { ItemId = itemId, UserId = target.GetUser().Id, Amount = amount}; - InventoryManager.AddItemToInventory(target, item); - } + #region Support [Command("o", "~m~Benutzung: ~s~/o [Nachricht]", GreedyArg = true)] @@ -1062,6 +1026,48 @@ namespace reallife_gamemode.Server.Commands #region ALevel1337 + + [Command("giveitem", "~m~Benutzung: ~s~/giveitem [Target] [Item ID] [Anzahl]")] + public void CmdAdminGiveItem(Client player, string targetname, int itemId, int amount) + { + if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true) + { + ChatService.NotAuthorized(player); + return; + } + + Client target = ClientService.GetClientByNameOrId(targetname); + if (target == null || !target.IsLoggedIn()) + { + ChatService.PlayerNotFound(player); + return; + } + + UserItem item = new UserItem() { ItemId = itemId, UserId = target.GetUser().Id, Amount = amount }; + InventoryManager.AddItemToInventory(target, item); + } + + [Command("inventory", "~m~Benutzung: ~s~/inventory [Spieler]")] + public void CmdAdminGiveItem(Client player, string targetname) + { + if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true) + { + ChatService.NotAuthorized(player); + return; + } + + Client target = ClientService.GetClientByNameOrId(targetname); + if (target == null || !target.IsLoggedIn()) + { + ChatService.PlayerNotFound(player); + return; + } + + var user = target.GetUser(); + + InventoryManager.GetUserItemsAsAdmin(player, user); + } + [Command("editmode")] public void CmdAdminToggleEditMode(Client player) { diff --git a/Server/Managers/InventoryManager.cs b/Server/Managers/InventoryManager.cs index 1d60fa4f..a494b7ce 100644 --- a/Server/Managers/InventoryManager.cs +++ b/Server/Managers/InventoryManager.cs @@ -6,6 +6,7 @@ using reallife_gamemode.Server.Commands; using reallife_gamemode.Server.Entities; using reallife_gamemode.Server.Extensions; using reallife_gamemode.Server.Inventory.Interfaces; +using reallife_gamemode.Server.Services; using System; using System.Collections.Generic; using System.Linq; @@ -101,6 +102,32 @@ namespace reallife_gamemode.Server.Managers } } + public static void GetUserItemsAsAdmin(Client player, Entities.User user) + { + var inventoryWeight = 0; + + using (var context = new DatabaseContext()) + { + List userItems = context.UserItems.ToList().FindAll(i => i.UserId == user.Id); + string[][] items = new string[userItems.Count][]; + foreach (var item in userItems) + { + IItem iItem = GetItemById(item.ItemId); + var currentItemWeight = iItem.Gewicht * item.Amount; + inventoryWeight += currentItemWeight; + + items[userItems.IndexOf(item)] = new string[6]; + items[userItems.IndexOf(item)][0] = iItem.Name; + items[userItems.IndexOf(item)][1] = iItem.Description; + items[userItems.IndexOf(item)][2] = iItem.Gewicht.ToString(); + items[userItems.IndexOf(item)][3] = item.Amount.ToString(); + items[userItems.IndexOf(item)][4] = item.Slot.ToString(); + items[userItems.IndexOf(item)][5] = item.Id.ToString(); + } + player.TriggerEvent("showInventoryToAdmin", user.Name, inventoryWeight, items); + } + } + [RemoteEvent("saveInventory")] public void SavePlayerInventory(Client player, string itemArray) { @@ -147,9 +174,9 @@ namespace reallife_gamemode.Server.Managers var user = player.GetUser(); using (var context = new DatabaseContext()) { - - List allItemsByUser = context.UserItems.ToList().FindAll(i => i.UserId == user.Id); + + List allItemsByUser = context.UserItems.ToList().FindAll(i => i.UserId == user.Id); var slotArr = Enumerable.Range(1, 20).ToList(); allItemsByUser.ForEach(allItem => { @@ -164,10 +191,34 @@ namespace reallife_gamemode.Server.Managers IItem iItem = GetItemById(item.ItemId); - string[] newItem = new string[] { iItem.Name, iItem.Description, iItem.Gewicht.ToString(), item.Amount.ToString(), newSlot.ToString(), item.Id.ToString()}; + string[] newItem = new string[] { iItem.Name, iItem.Description, iItem.Gewicht.ToString(), item.Amount.ToString(), newSlot.ToString(), item.Id.ToString() }; - player.TriggerEvent("addItem", newItem); + player.TriggerEvent("addItem", JsonConvert.SerializeObject(newItem)); + } + } + [RemoteEvent("removeItemAsAdmin")] + public void SavePlayerInventory(Client player, string amount, string userItemId, string targetPlayerName) + { + using (var context = new DatabaseContext()) + { + UserItem fItem = context.UserItems.FirstOrDefault(j => j.Id == int.Parse(userItemId)); + + Client targetPlayer = ClientService.GetClientByNameOrId(targetPlayerName); + + if (amount == "stack") + { + var itemSlot = fItem.Slot; + targetPlayer.TriggerEvent("removeItem", userItemId, "stack"); + context.UserItems.Remove(fItem); + } + else if (amount == "one") + { + var itemSlot = fItem.Slot; + targetPlayer.TriggerEvent("removeItem", userItemId, "one"); + fItem.Amount--; + } + context.SaveChanges(); } } } -} +} \ No newline at end of file