[+] Improved Inventory System based on old Inventory Manager and new GUI. (test version)

This commit is contained in:
Lukas Moungos
2019-09-12 21:40:27 +02:00
parent df82f8f291
commit deb6b7092e
60 changed files with 2856 additions and 2813 deletions

View File

@@ -5,34 +5,24 @@ export default function inventory(globalData: GlobalData): void {
var invBrowser: BrowserMp = null;
var itemIdArr;
var itemAmountArr;
var vehItemIdArr;
var vehItemAmountArr;
var money;
var vehId;
var invWeight;
var itemNameArr;
mp.events.add("openTradeWindow", (money1, itemIdArr1, itemAmountArr1) => {
if (!globalData.InMenu) {
if (invBrowser !== null) {
try {
invBrowser.destroy()
invBrowser = null;
} finally {
mp.gui.cursor.show(false, false);
}
return;
}
mp.gui.cursor.show(true, true);
invBrowser = mp.browsers.new("package://assets/html/inventory/handel/handelakzeptieren.html");
var ivehArr;
itemIdArr = itemIdArr1;
itemAmountArr = itemAmountArr1;
money = money1;
}
});
var Players;
mp.events.add('vehInventoryShow', (itemIdArr1, itemAmountArr1, vehItemIdArr1, vehItemAmountArr1, vehId1) => {
mp.events.add('setVehiclesInventory', (vehInvArr) => {
ivehArr = vehInvArr;
invBrowser.execute(`setVehiclesInv('${JSON.stringify(ivehArr)}');`);
});
mp.events.add('showVehInventory', () => {
invBrowser.execute(`execVehInv();`);
});
mp.events.add('inventoryShow', (iWeight, iNameArr, iAmountArr, iIdArr, playersArr) => {
if (!globalData.InMenu) {
if (invBrowser !== null) {
try {
@@ -46,53 +36,53 @@ export default function inventory(globalData: GlobalData): void {
}
mp.gui.cursor.show(true, true);
invBrowser = mp.browsers.new("package://assets/html/inventory/vehicle/index.html");
itemIdArr = itemIdArr1;
itemAmountArr = itemAmountArr1;
vehItemIdArr = vehItemIdArr1;
vehItemAmountArr = vehItemAmountArr1;
vehId = vehId1;
Players = playersArr;
itemIdArr = iIdArr;
itemAmountArr = iAmountArr;
itemNameArr = iNameArr;
invWeight = iWeight;
invBrowser = mp.browsers.new("package://assets/html/inventory/inventory.html");
}
});
mp.events.add('inventoryShow', (itemIdArr1, itemAmountArr1) => {
if (!globalData.InMenu) {
if (invBrowser !== null) {
try {
invBrowser.destroy()
invBrowser = null;
}
finally {
mp.gui.cursor.show(false, false);
}
return;
}
mp.gui.cursor.show(true, true);
invBrowser = mp.browsers.new("package://assets/html/inventory/index.html");
itemIdArr = itemIdArr1;
itemAmountArr = itemAmountArr1;
mp.events.addDataHandler("tradeOffer", (entity, value) => {
if (entity.type === "player") {
let offer = parseInt(value);
invBrowser.execute(`changeTradeStatus('${JSON.stringify(offer)}')`);
}
});
mp.events.add("addTradeItems", (itemId, itemAmount, itemName, weight) => {
invBrowser.execute(`setAnfrage('${JSON.stringify(itemId)}','${JSON.stringify(itemAmount)}','${JSON.stringify(itemName)}','${JSON.stringify(weight)}');`);
});
mp.events.add("CEF:saveVehicleTransfer", (val, jsonOrigin, jsonInvID, jsonInvAmount, jsonVehAmount) => {
if (val == 0) {
mp.events.callRemote('saveInventory', jsonInvID, jsonInvAmount, jsonOrigin, jsonVehAmount);
} else if(val == 1){
mp.events.callRemote('saveVehicleInventory', jsonInvID, jsonInvAmount, jsonOrigin, jsonVehAmount);
}
});
mp.events.add("CEF:invThrowItem", (itemId, amount) => {
mp.events.callRemote('invThrowItem', itemId, amount);
});
mp.events.add("CEF:BrowserLoaded", () => {
invBrowser.execute(`setItems("${JSON.stringify(itemIdArr)}","${JSON.stringify(itemAmountArr)}");`);
});
mp.events.add("CEF:BrowserLoadedTrade", () => {
invBrowser.execute(`setItems("${JSON.stringify(itemIdArr)}","${JSON.stringify(itemAmountArr)}","${JSON.stringify(money)}");`);
});
mp.events.add("CEF:BrowserLoadedVehicle", () => {
invBrowser.execute(`setItems("${JSON.stringify(itemIdArr)}","${JSON.stringify(itemAmountArr)}");`);
invBrowser.execute(`setVehItems("${JSON.stringify(vehItemIdArr)}","${JSON.stringify(vehItemAmountArr)}","${JSON.stringify(vehId)}");`);
mp.events.add("CEF:throwItem", (type, amount, id) => {
mp.events.callRemote("itemInteract", type, amount, id);
});
mp.events.add("CEF:InventoryLoaded", () => {
invBrowser.execute(`setItems('${JSON.stringify(itemNameArr)}','${JSON.stringify(itemIdArr)}','${JSON.stringify(itemAmountArr)}','${JSON.stringify(Players)}');`);
invBrowser.execute(`setWeight('${JSON.stringify(invWeight)}');`);
});
mp.events.add("CEF:getNearVehicles", () => {
mp.events.callRemote('getNearVehicles');
});
mp.events.add("CEF:acceptTrade", () => {
if (invBrowser !== null) {