0 / 40 Kilogramm
Rucksack
+
+
-
-
-
-
-
\ No newline at end of file
diff --git a/ReallifeGamemode.Client/assets/html/inventory/handel/script.js b/ReallifeGamemode.Client/assets/html/inventory/handel/script.js
deleted file mode 100644
index 61ab079c..00000000
--- a/ReallifeGamemode.Client/assets/html/inventory/handel/script.js
+++ /dev/null
@@ -1,336 +0,0 @@
-
-$(document).ready(function () {
- //fire functions before page load
- drawToPage();
- console.log("loading finished");
- mp.trigger("CEF:BrowserLoadedTrade");
-});
-
-function setItems(itemIdArr1, itemAmountArr1, money1) {
- var itemIdArr = JSON.parse(itemIdArr1);
- var money = JSON.parse(money1);
- var itemAmountArr = JSON.parse(itemAmountArr1);
- document.getElementById('gewicht').innerText = 'Preis: '+money+'$';
- var itemAmountArr = JSON.parse(itemAmountArr1);
- for (var i = 0; i < itemIdArr.length; i++) {
- for (x = 0; x < itemAmountArr[i]; x++) {
- commands.addToPlayerInv(itemIdArr[i]);
- console.log(i);
- }
- }
-}
-
-var holz = {
- name: "Holz",
- rarity: 'common',
- selected: 'false',
- usable: 'true',
- amount: 1,
- currentWeight: 0.65,
- stackable: 'true',
- object: 'true',
- itemId: 1,
- img: "package://assets/img/items/wood.svg"
-}
-var hamburger = {
- name: "Hamburger",
- rarity: 'common',
- selected: 'false',
- usable: 'true',
- amount: 1,
- currentWeight: 0.3,
- stackable: 'true',
- object: 'true',
- itemId: 2,
- img: "package://assets/img/items/burger.svg"
-}
-var cocaine = {
- name: "Koks",
- rarity: 'common',
- selected: 'false',
- usable: 'true',
- amount: 1,
- currentWeight: 0.05,
- stackable: 'true',
- object: 'true',
- itemId: 3,
- img: "package://assets/img/items/cocaine.svg"
-}
-var cannabis = {
- name: "Cannabis",
- rarity: 'common',
- selected: 'false',
- usable: 'true',
- amount: 1,
- currentWeight: 0.05,
- stackable: 'true',
- object: 'true',
- itemId: 4,
- img: "package://assets/img/items/cannabis.svg"
-}
-var flunder = {
- name: "Flunder",
- weight: 7.7,
- currentWeight: 1,
- rarity: 'fishes',
- statSlots: [],
- runes: [],
- amount: 1,
- usable: 'false',
- selected: 'false',
- stackable: 'false',
- object: 'true',
- itemId: 5,
- img: 'package://assets/img/items/flounder.svg'
-}
-var aal = {
- name: "Aal",
- weight: 3.6,
- currentWeight: 1,
- rarity: 'fishes',
- statSlots: [],
- runes: [],
- amount: 1,
- usable: 'false',
- selected: 'false',
- stackable: 'false',
- object: 'true',
- itemId: 6,
- img: 'package://assets/img/items/aal.svg'
-}
-var barsch = {
- name: "Barsch",
- weight: 2.6,
- currentWeight: 1,
- rarity: 'fishes',
- statSlots: [],
- runes: [],
- amount: 1,
- usable: 'false',
- selected: 'false',
- stackable: 'false',
- object: 'true',
- itemId: 7,
- img: 'package://assets/img/items/perch.svg'
-}
-var lachs = {
- name: "Lachs",
- weight: 4.2,
- currentWeight: 1,
- rarity: 'fishes',
- statSlots: [],
- runes: [],
- amount: 1,
- usable: 'false',
- selected: 'false',
- stackable: 'false',
- object: 'true',
- itemId: 8,
- img: 'package://assets/img/items/salmon.svg'
-}
-var thunfisch = {
- name: "Thunfisch",
- weight: 11,
- currentWeight: 1,
- rarity: 'fishes',
- statSlots: [],
- runes: [],
- amount: 1,
- usable: 'false',
- selected: 'false',
- stackable: 'false',
- object: 'true',
- itemId: 9,
- img: 'package://assets/img/items/salmon.svg'
-}
-var zander = {
- name: "Zander",
- weight: 5,
- currentWeight: 1,
- rarity: 'fishes',
- statSlots: [],
- runes: [],
- amount: 1,
- usable: 'false',
- selected: 'false',
- stackable: 'false',
- object: 'true',
- itemId: 10,
- img: 'package://assets/img/items/zander.svg'
-}
-
-var allItems = [holz, hamburger, cocaine, cannabis, flunder, aal, barsch, lachs, thunfisch, zander];
-
-////////////////////////
-// Player Invenotry //
-////////////////////////
-
-var playerInventory = [];
-var EmptySlot = { name: 'blankSpace', rarity: '', object: 'false' };
-
-
-function addToInvenotry(addItem) {
- var cloneItem = Object.assign({}, addItem);
- var getExsistingId = cloneItem.itemId;
- var unfininshedStack;
-
-
- //Checks to see if any items can be stacked, the location, and stack amount
- for (var i = 0; i < playerInventory.length; i++) {
- if (playerInventory[i].itemId === getExsistingId && cloneItem.stackable === 'true' && playerInventory[i].amount < 10) {
- unfininshedStack = i
- break;
- }
- }
- if (cloneItem.currentWeight * cloneItem.amount + weightInv >= 25) {
- return;
- }
-
- //Adds item to inventory
- for (var i = 0; i < playerInventory.length; i++) {
- if (unfininshedStack != undefined) {
- if (playerInventory[unfininshedStack].amount + cloneItem.amount <= 10) {
- playerInventory[unfininshedStack].amount += cloneItem.amount;
- unfininshedStack = undefined;
- drawToPage();
- break;
- }
- else if (playerInventory[unfininshedStack].amount + cloneItem.amount > 10) {
- var stackRemainder = 10 - playerInventory[unfininshedStack].amount;
- playerInventory[unfininshedStack].amount += stackRemainder;
- cloneItem.amount -= stackRemainder;
- var recycleCloned = cloneItem;
- addToInvenotry(recycleCloned);
- unfininshedStack = undefined;
- drawToPage();
- break;
- }
- }
- else if (cloneItem.amount > 10 && playerInventory[i].object === 'false') {
- var reduceCloneAmount = Object.assign({}, cloneItem);
- reduceCloneAmount.amount = 10;
- playerInventory[i] = reduceCloneAmount;
- cloneItem.amount -= 10;
- addToInvenotry(cloneItem);
- drawToPage();
- break;
- }
- else if (unfininshedStack == undefined && playerInventory[i].object === 'false') {
- playerInventory[i] = cloneItem;
- drawToPage();
- break;
- }
- }
-}
-
-var getItemSlotData;
-function getAllItemSlotData() {
- getItemSlotData = document.getElementsByClassName('itemSlot');
-}
-
-
-var currentSelected;
-
-function refreshAllCurrentItems() {
- var remove = document.getElementById('invContainer');
- while (remove.firstChild) remove.removeChild(remove.firstChild);
-}
-
-
-function fillOutEmptyInv() {
- for (var i = 0; i < 6; i++) {
- if (!playerInventory[i]) {
- playerInventory.push(EmptySlot);
- drawToPage();
- }
- }
-}
-var weightInv = 0;
-function drawToPage() {
- refreshAllCurrentItems();
- weightInv = 0;
- for (var i = 0; i < playerInventory.length; i++) {
- if (playerInventory[i].selected == 'true') {
- var className = ' selected';
- }
- else {
- var className = '';
- }
-
- if (i >= 6) {
- //Keeps inventory set to 10 items max
- console.log('Inventory is full!')
- return;
- }
- else {
- //creates item element
- var item = document.createElement("div");
- item.className = "itemSlot " + playerInventory[i].rarity + className;
- item.setAttribute("data-value", i);
- item.setAttribute("inv-type", 'p');
- item.setAttribute("object", playerInventory[i].object);
- item.setAttribute('style', 'background: url(' + playerInventory[i].img + '); background-size: contain;');
-
- //show element amounts
- var itemAmount = document.createElement("div");
- itemAmount.className = "itemAmount";
- var itemAmountDisplay = document.createElement("p");
- if (playerInventory[i].amount) {
- var itemDisplayStatsName = document.createTextNode(playerInventory[i].amount);
- }
- else {
- var itemDisplayStatsName = document.createTextNode('');
- }
- item.appendChild(itemAmount);
- itemAmount.appendChild(itemAmountDisplay);
- itemAmountDisplay.appendChild(itemDisplayStatsName);
-
-
- //adds item element or elements
- document.getElementById("invContainer").appendChild(item);
-
- //creates item display information
- if (playerInventory[i].object === 'true') {
- var itemDesc = document.createElement("div");
- var itemDescTitle = document.createElement("h3");
-
- var getItemTitle = document.createTextNode(playerInventory[i].name + " (" + Math.round(playerInventory[i].currentWeight * playerInventory[i].amount * 100) / 100 + " kg)");
- itemDesc.className = "itemDesc";
- item.appendChild(itemDesc);
- itemDesc.appendChild(itemDescTitle);
- itemDescTitle.appendChild(getItemTitle);
- }
- }
- }
- fillOutEmptyInv();
-}
-
-
-///////////////////
-// Dev Commands //
-///////////////////
-
-var commands = {
- addToPlayerInv: function (itemGiveId) {
- for (var i = 0; i < allItems.length; i++) {
- if (allItems[i].itemId === itemGiveId) {
- addToInvenotry(allItems[i]);
- }
- }
- },
- clearPlayerInv: function () {
- playerInventory = [];
- drawToPage();
- },
-}
-
-
-//Handel Akzeptierenfenster
-
-$("#buttonakzeptieren").click(function () {
- mp.trigger('CEF:acceptTrade');
-});
-
-$("#buttonablehnen").click(function () {
- mp.trigger('CEF:declineTrade');
-});
diff --git a/ReallifeGamemode.Client/assets/html/inventory/handel/style.css b/ReallifeGamemode.Client/assets/html/inventory/handel/style.css
deleted file mode 100644
index 3beb72fe..00000000
--- a/ReallifeGamemode.Client/assets/html/inventory/handel/style.css
+++ /dev/null
@@ -1,284 +0,0 @@
-/* *** FOR TESTING ONLY *** */
-.greyFont {
- color: gray;
- font-size: 14px;
- width: 250px;
-}
-
-body {
- overflow: hidden;
- font-family: 'Roboto', sans-serif;
- font-weight: 500;
- color: #222;
- margin: 0;
- padding: 0;
-}
-#buttonbenutzen {
- background-color: #4CAF50; /* gruen */
- border: none;
- color: white;
- padding: 12px 24px;
- text-align: center;
- text-decoration: none;
- display: inline-block;
- font-size: 16px;
- position: relative;
- left: 1.5%;
-}
-#buttonwegwerfen {
- background-color: #f44336; /* rot */
- border: none;
- color: white;
- padding: 12px 24px;
- text-align: center;
- text-decoration: none;
- display: inline-block;
- font-size: 16px;
- position: relative;
- left: 1.5%;
-}
-#buttonhandeln {
- background-color: #008CBA; /* blau */
- border: none;
- color: white;
- padding: 12px 24px;
- text-align: center;
- text-decoration: none;
- display: inline-block;
- font-size: 16px;
- position: relative;
- left: 1.5%;
-}
-#buttonablehnen {
- background-color: #f44336; /* rot */
- border: none;
- color: white;
- padding: 12px 24px;
- text-align: center;
- text-decoration: none;
- display: inline-block;
- font-size: 16px;
- position: relative;
- left: 18%;
-}
-#buttonakzeptieren {
- background-color: #008CBA; /* blau */
- border: none;
- color: white;
- padding: 12px 24px;
- text-align: center;
- text-decoration: none;
- display: inline-block;
- font-size: 16px;
- position: relative;
- left: 18%;
-}
-
-button {
- width: 125px;
- background-color: lightGrey;
- padding: 5px;
- margin: 2px 0px;
- border: none;
- cursor: pointer;
-}
-
-button:hover {
- background-color: grey;
-}
-
-h2 {
- font-family: 'Roboto', sans-serif;
- font-weight: 700;
- font-size: 18px;
- color: white;
- margin:5px;
- padding: 5px;
- border: 1px solid #808080;
- width: 20.75em;
-}
-.box1 {
- float: left;
- width: 50%;
-}
-.box2 {
-
- padding: 2px;
-
- }
-
-h4 {
- font-family: 'Roboto', sans-serif;
- font-weight: 700;
- font-size: 18px;
- color: white;
- margin:5px;
- padding: 5px;
- text-align:right;
- border: none;
-}
-
-.pakWrapper {
- background: rgba(0,0,0,0.4);
- height: 170px;
- width: 394px;
- display: block;
- padding: 5px;
- position: absolute;
- left: 38%;
- top: 35%;
-}
-
-#invContainer{
- width: 110%;
- height: auto;
-}
-
-#invContainer h3 {
- padding: 0px 10px;
-}
-
-.itemSlot {
- width: 54px;
- height: 54px;
- margin: 5px;
- float: left;
- border: 1px solid #808080;
- border-radius: 5px;
- position: relative;
- cursor: pointer;
-}
-
-.itemSlot:hover {
- border: 1px solid #999999;
-}
-
-.itemAmount p {
- color: white;
- font-family: 'Roboto', sans-serif;
- font-weight: 700;
- text-shadow: 0px 0px 2px black;
- position: absolute;
- top: 16px;
- left: 4px;
-}
-
-
-.selected {
- box-shadow: 0px 0px 6px white;
- border: 1px solid yellow;
-}
-
-.common {
- box-shadow: 0 0 2px 1px white inset;
-}
-
-.common h3 {
- color: white;
- text-shadow: 0 0 0 1px black;
-}
-
-.uncommon {
- box-shadow: 0 0 2px 1px #3333ff inset;
-}
-
-.uncommon h3 {
- color: #3333ff;
- text-shadow: 0 0 0 1px black;
-}
-
-.rare {
- box-shadow: 0 0 2px 1px #66ff33 inset;
-}
-
-.rare h3 {
- color: #66ff33;
- text-shadow: 0 0 0 1px black;
-}
-
-.superior {
- box-shadow: 0 0 3px 1px #990099 inset;
-}
-
-.superior h3 {
- color: #990099;
- text-shadow: 0px 0px 1px black;
-}
-
-.mythic {
- box-shadow: 0 0 3px 1px #ffa333 inset;
-}
-
-.mythic h3 {
- color: #ffa333;
- text-shadow: 0px 0px 1px black;
-}
-
-.pForgeWrapper {
- background: #222;
- height: 176px;
- width: 330px;
- display: block;
- padding: 5px;
- position: absolute;
- left: 0;
- top: 0;
-}
-
-/*item description */
-.itemSlot:hover > .itemDesc {
- display: block;
-}
-
-.itemDesc {
- width: 250px;
- height: auto;
- top: 60px;
- border: 1px solid #808080;
- border-radius: 5px;
- background: #1a1a1a;
- position: absolute;
- display: none;
- z-index: 9999;
-}
-
-.itemDesc p{
- color: white;
-}
-/*Handelfenster */
-#tf_betrag {
- background-color: #008CBA; /* blau */
- border: none;
- height: 30px;
- width: 124px;
- text-align: center;
- text-decoration: none;
- display: inline-block;
- font-size: 16px;
- font-color: white;
- position: relative;
- left: 1.5%;
- color:#ffffff;
-}
-::placeholder {
- color: white;
- opacity: 1;
-}
-#tf_submit {
- background-color: #008CBA; /* blau */
- border: none;
- height: 32px;
- width: 124px;
- text-align: center;
- text-decoration: none;
- display: inline-block;
- font-size: 16px;
- font-color: white;
- position: relative;
- left: 1.5%;
- color:#ffffff;
-}
-
-
-
-/* tasks */
\ No newline at end of file
diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/backpack/1.png b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/1.png
new file mode 100644
index 00000000..02e8d2f7
Binary files /dev/null and b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/1.png differ
diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/backpack/2.png b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/2.png
new file mode 100644
index 00000000..70fb7a75
Binary files /dev/null and b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/2.png differ
diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/backpack/3.png b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/3.png
new file mode 100644
index 00000000..7b8362e7
Binary files /dev/null and b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/3.png differ
diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/backpack/4.png b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/4.png
new file mode 100644
index 00000000..01eb6ae7
Binary files /dev/null and b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/4.png differ
diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/backpack/5.png b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/5.png
new file mode 100644
index 00000000..27e291a0
Binary files /dev/null and b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/5.png differ
diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/backpack/6.png b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/6.png
new file mode 100644
index 00000000..9770da07
Binary files /dev/null and b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/6.png differ
diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/backpack/Cloth.7z b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/Cloth.7z
new file mode 100644
index 00000000..d7b81b65
Binary files /dev/null and b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/Cloth.7z differ
diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/backpack/apple.png b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/apple.png
new file mode 100644
index 00000000..50d93b72
Binary files /dev/null and b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/apple.png differ
diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/backpack/back.svg b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/back.svg
new file mode 100644
index 00000000..aea77d7a
--- /dev/null
+++ b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/back.svg
@@ -0,0 +1,45 @@
+
+
+
diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/backpack/backpack.svg b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/backpack.svg
new file mode 100644
index 00000000..7752ed6b
--- /dev/null
+++ b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/backpack.svg
@@ -0,0 +1,107 @@
+
+
+
diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/backpack/car.svg b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/car.svg
new file mode 100644
index 00000000..bf422045
--- /dev/null
+++ b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/car.svg
@@ -0,0 +1,91 @@
+
+
+
diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/backpack/notes.svg b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/notes.svg
new file mode 100644
index 00000000..d98c7c33
--- /dev/null
+++ b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/notes.svg
@@ -0,0 +1,64 @@
+
+
+
diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/backpack/paper-plane.svg b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/paper-plane.svg
new file mode 100644
index 00000000..d3518a9d
--- /dev/null
+++ b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/paper-plane.svg
@@ -0,0 +1,61 @@
+
+
+
diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/backpack/save-money.svg b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/save-money.svg
new file mode 100644
index 00000000..00eddf72
--- /dev/null
+++ b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/save-money.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/backpack/trading.svg b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/trading.svg
new file mode 100644
index 00000000..1f599e9c
--- /dev/null
+++ b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/trading.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/backpack/transparent.png b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/transparent.png
new file mode 100644
index 00000000..7a110449
Binary files /dev/null and b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/transparent.png differ
diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/backpack/trash.svg b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/trash.svg
new file mode 100644
index 00000000..bcb057ab
--- /dev/null
+++ b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/trash.svg
@@ -0,0 +1,65 @@
+
+
+
diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/backpack/use.png b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/use.png
new file mode 100644
index 00000000..8783b925
Binary files /dev/null and b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/use.png differ
diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/backpack/use.svg b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/use.svg
new file mode 100644
index 00000000..3454fa59
--- /dev/null
+++ b/ReallifeGamemode.Client/assets/html/inventory/img/backpack/use.svg
@@ -0,0 +1,47 @@
+
+
+
diff --git a/ReallifeGamemode.Client/assets/img/items/wood.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/1.svg
similarity index 100%
rename from ReallifeGamemode.Client/assets/img/items/wood.svg
rename to ReallifeGamemode.Client/assets/html/inventory/img/inventory/1.svg
diff --git a/ReallifeGamemode.Client/assets/img/items/zander.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/10.svg
similarity index 100%
rename from ReallifeGamemode.Client/assets/img/items/zander.svg
rename to ReallifeGamemode.Client/assets/html/inventory/img/inventory/10.svg
diff --git a/ReallifeGamemode.Client/assets/img/items/burger.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/2.svg
similarity index 100%
rename from ReallifeGamemode.Client/assets/img/items/burger.svg
rename to ReallifeGamemode.Client/assets/html/inventory/img/inventory/2.svg
diff --git a/ReallifeGamemode.Client/assets/img/items/cocaine.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/3.svg
similarity index 100%
rename from ReallifeGamemode.Client/assets/img/items/cocaine.svg
rename to ReallifeGamemode.Client/assets/html/inventory/img/inventory/3.svg
diff --git a/ReallifeGamemode.Client/assets/img/items/cannabis.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/4.svg
similarity index 100%
rename from ReallifeGamemode.Client/assets/img/items/cannabis.svg
rename to ReallifeGamemode.Client/assets/html/inventory/img/inventory/4.svg
diff --git a/ReallifeGamemode.Client/assets/img/items/flounder.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/5.svg
similarity index 100%
rename from ReallifeGamemode.Client/assets/img/items/flounder.svg
rename to ReallifeGamemode.Client/assets/html/inventory/img/inventory/5.svg
diff --git a/ReallifeGamemode.Client/assets/img/items/aal.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/6.svg
similarity index 100%
rename from ReallifeGamemode.Client/assets/img/items/aal.svg
rename to ReallifeGamemode.Client/assets/html/inventory/img/inventory/6.svg
diff --git a/ReallifeGamemode.Client/assets/img/items/perch.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/7.svg
similarity index 100%
rename from ReallifeGamemode.Client/assets/img/items/perch.svg
rename to ReallifeGamemode.Client/assets/html/inventory/img/inventory/7.svg
diff --git a/ReallifeGamemode.Client/assets/img/items/salmon.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/8.svg
similarity index 100%
rename from ReallifeGamemode.Client/assets/img/items/salmon.svg
rename to ReallifeGamemode.Client/assets/html/inventory/img/inventory/8.svg
diff --git a/ReallifeGamemode.Client/assets/img/items/tuna.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/9.svg
similarity index 100%
rename from ReallifeGamemode.Client/assets/img/items/tuna.svg
rename to ReallifeGamemode.Client/assets/html/inventory/img/inventory/9.svg
diff --git a/ReallifeGamemode.Client/assets/html/inventory/index.html b/ReallifeGamemode.Client/assets/html/inventory/index.html
deleted file mode 100644
index 0e89e41f..00000000
--- a/ReallifeGamemode.Client/assets/html/inventory/index.html
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-
-
-
-
-
- Handel Akzeptieren
Preis: 0$
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Inventar
0/25 kg
-
-
-
-
-
-
-
-
-
-
-
-
-
- - - - - - - - - - - - diff --git a/ReallifeGamemode.Client/assets/html/inventory/inventory.html b/ReallifeGamemode.Client/assets/html/inventory/inventory.html new file mode 100644 index 00000000..bd4d2a7b --- /dev/null +++ b/ReallifeGamemode.Client/assets/html/inventory/inventory.html @@ -0,0 +1,874 @@ + + + + + + +
+
+
+
+ -
+
+ 
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReallifeGamemode.Client/assets/html/inventory/vehicle/index.html b/ReallifeGamemode.Client/assets/html/inventory/vehicle/index.html
deleted file mode 100644
index 87015609..00000000
--- a/ReallifeGamemode.Client/assets/html/inventory/vehicle/index.html
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/ReallifeGamemode.Client/assets/html/inventory/vehicle/script.js b/ReallifeGamemode.Client/assets/html/inventory/vehicle/script.js
deleted file mode 100644
index f46ec630..00000000
--- a/ReallifeGamemode.Client/assets/html/inventory/vehicle/script.js
+++ /dev/null
@@ -1,608 +0,0 @@
-
-$(document).ready(function () {
-
- //fire functions before page load
- drawToKofferraum();
- drawToPage();
- moveItemsInv();
- mp.trigger("CEF:BrowserLoadedVehicle");
- console.log("loading finished");
-
-});
-var vehID;
-
-function setItems(itemIdArr1, itemAmountArr1) {
- var itemIdArr = JSON.parse(itemIdArr1);
- var itemAmountArr = JSON.parse(itemAmountArr1);
- for (var i = 0; i < itemIdArr.length; i++) {
- for (x = 0; x < itemAmountArr[i]; x++) {
- commands.addToPlayerInv(itemIdArr[i]);
- }
- }
-}
-
-function setVehItems(itemIdArr1, itemAmountArr1, vehID1) {
- vehID = vehID1;
- var itemIdArr = JSON.parse(itemIdArr1);
- var itemAmountArr = JSON.parse(itemAmountArr1);
- for (var i = 0; i < itemIdArr.length; i++) {
- for (x = 0; x < itemAmountArr[i]; x++) {
- commands.addToVehInv(itemIdArr[i]);
- }
- }
-}
-
-
-var holz = {
- name: "Holz",
- rarity: 'common',
- selected: 'false',
- usable: 'true',
- amount: 1,
- currentWeight: 0.65,
- stackable: 'true',
- object: 'true',
- itemId: 1,
- img: "package://assets/img/items/wood.svg"
-}
-var hamburger = {
- name: "Hamburger",
- rarity: 'common',
- selected: 'false',
- usable: 'true',
- amount: 1,
- currentWeight: 0.3,
- stackable: 'true',
- object: 'true',
- itemId: 2,
- img: "package://assets/img/items/burger.svg"
-}
-var cocaine = {
- name: "Koks",
- rarity: 'common',
- selected: 'false',
- usable: 'true',
- amount: 1,
- currentWeight: 0.05,
- stackable: 'true',
- object: 'true',
- itemId: 3,
- img: "package://assets/img/items/cocaine.svg"
-}
-var cannabis = {
- name: "Cannabis",
- rarity: 'common',
- selected: 'false',
- usable: 'true',
- amount: 1,
- currentWeight: 0.05,
- stackable: 'true',
- object: 'true',
- itemId: 4,
- img: "package://assets/img/items/cannabis.svg"
-}
-var flunder = {
- name: "Flunder",
- weight: 7.7,
- currentWeight: 7.7,
- rarity: 'fishes',
- statSlots: [],
- runes: [],
- amount: 1,
- usable: 'false',
- selected: 'false',
- stackable: 'false',
- object: 'true',
- itemId: 5,
- img: 'package://assets/img/items/flounder.svg'
-}
-var aal = {
- name: "Aal",
- weight: 3.6,
- currentWeight: 3.6,
- rarity: 'fishes',
- statSlots: [],
- runes: [],
- amount: 1,
- usable: 'false',
- selected: 'false',
- stackable: 'false',
- object: 'true',
- itemId: 6,
- img: 'package://assets/img/items/aal.svg'
-}
-var barsch = {
- name: "Barsch",
- weight: 2.6,
- currentWeight: 2.6,
- rarity: 'fishes',
- statSlots: [],
- runes: [],
- amount: 1,
- usable: 'false',
- selected: 'false',
- stackable: 'false',
- object: 'true',
- itemId: 7,
- img: 'package://assets/img/items/perch.svg'
-}
-var lachs = {
- name: "Lachs",
- weight: 4.2,
- currentWeight: 4.2,
- rarity: 'fishes',
- statSlots: [],
- runes: [],
- amount: 1,
- usable: 'false',
- selected: 'false',
- stackable: 'false',
- object: 'true',
- itemId: 8,
- img: 'package://assets/img/items/salmon.svg'
-}
-var thunfisch = {
- name: "Thunfisch",
- weight: 11,
- currentWeight: 11,
- rarity: 'fishes',
- statSlots: [],
- runes: [],
- amount: 1,
- usable: 'false',
- selected: 'false',
- stackable: 'false',
- object: 'true',
- itemId: 9,
- img: 'package://assets/img/items/salmon.svg'
-}
-var zander = {
- name: "Zander",
- weight: 5,
- currentWeight: 5,
- rarity: 'fishes',
- statSlots: [],
- runes: [],
- amount: 1,
- usable: 'false',
- selected: 'false',
- stackable: 'false',
- object: 'true',
- itemId: 10,
- img: 'package://assets/img/items/zander.svg'
-}
-
-var allItems = [holz, hamburger, cocaine, cannabis, flunder, aal, barsch, lachs, thunfisch, zander];
-
-
-
-
-////////////////////////
-// Player Invenotry //
-////////////////////////
-var playerInventory = [];
-var EmptySlot = { name: 'blankSpace', rarity: '', object: 'false' };
-
-function addToVehInvenotry(addItem) {
- var cloneItem = Object.assign({}, addItem);
- var getExsistingId = cloneItem.itemId;
- var unfininshedStack;
-
-
- //Checks to see if any items can be stacked, the location, and stack amount
- for (var i = 24; i < playerInventory.length; i++) {
- if (playerInventory[i].itemId === getExsistingId && cloneItem.stackable === 'true' && playerInventory[i].amount < 10) {
- unfininshedStack = i
- break;
- }
- }
- if (cloneItem.currentWeight * cloneItem.amount + weightInv >= 250) {
- return;
- }
-
- //Adds item to inventory
- for (var i = 24; i < playerInventory.length; i++) {
- if (unfininshedStack != undefined) {
- if (playerInventory[unfininshedStack].amount + cloneItem.amount <= 30) {
- playerInventory[unfininshedStack].amount += cloneItem.amount;
- unfininshedStack = undefined;
- drawToKofferraum();
- moveItemsInv();
- break;
- }
- else if (playerInventory[unfininshedStack].amount + cloneItem.amount > 30) {
- var stackRemainder = 30 - playerInventory[unfininshedStack].amount;
- playerInventory[unfininshedStack].amount += stackRemainder;
- cloneItem.amount -= stackRemainder;
- var recycleCloned = cloneItem;
- addToInvenotry(recycleCloned);
- unfininshedStack = undefined;
- drawToKofferraum();
- moveItemsInv();
- break;
- }
- }
- else if (cloneItem.amount > 30 && playerInventory[i].object === 'false') {
- var reduceCloneAmount = Object.assign({}, cloneItem);
- reduceCloneAmount.amount = 30;
- playerInventory[i] = reduceCloneAmount;
- cloneItem.amount -= 30;
- addToInvenotry(cloneItem);
- drawToKofferraum();
- moveItemsInv();
- break;
- }
- else if (unfininshedStack == undefined && playerInventory[i].object === 'false') {
- playerInventory[i] = cloneItem;
- drawToKofferraum();
- moveItemsInv();
- break;
- }
- }
-}
-
-function addToInvenotry(addItem) {
- var cloneItem = Object.assign({}, addItem);
- var getExsistingId = cloneItem.itemId;
- var unfininshedStack;
-
-
- //Checks to see if any items can be stacked, the location, and stack amount
- for (var i = 0; i < playerInventory.length; i++) {
- if (playerInventory[i].itemId === getExsistingId && cloneItem.stackable === 'true' && playerInventory[i].amount < 10) {
- unfininshedStack = i
- break;
- }
- }
- if (cloneItem.currentWeight * cloneItem.amount + weightInv >= 45) {
- return;
- }
-
- //Adds item to inventory
- for (var i = 0; i < playerInventory.length; i++) {
- if (unfininshedStack != undefined) {
- if (playerInventory[unfininshedStack].amount + cloneItem.amount <= 10) {
- playerInventory[unfininshedStack].amount += cloneItem.amount;
- unfininshedStack = undefined;
- drawToPage();
- moveItemsInv();
- break;
- }
- else if (playerInventory[unfininshedStack].amount + cloneItem.amount > 10) {
- var stackRemainder = 10 - playerInventory[unfininshedStack].amount;
- playerInventory[unfininshedStack].amount += stackRemainder;
- cloneItem.amount -= stackRemainder;
- var recycleCloned = cloneItem;
- addToInvenotry(recycleCloned);
- unfininshedStack = undefined;
- drawToPage();
- moveItemsInv();
- break;
- }
- }
- else if (cloneItem.amount > 10 && playerInventory[i].object === 'false') {
- var reduceCloneAmount = Object.assign({}, cloneItem);
- reduceCloneAmount.amount = 10;
- playerInventory[i] = reduceCloneAmount;
- cloneItem.amount -= 10;
- addToInvenotry(cloneItem);
- drawToPage();
- moveItemsInv();
- break;
- }
- else if (unfininshedStack == undefined && playerInventory[i].object === 'false') {
- playerInventory[i] = cloneItem;
- drawToPage();
- moveItemsInv();
- break;
- }
- }
-}
-
-var getItemSlotData;
-function getAllItemSlotData() {
- getItemSlotData = document.getElementsByClassName('itemSlot');
-}
-
-
-var currentSelected;
-function moveItemsInv() {
- getAllItemSlotData();
- for (var i = 0; i < getItemSlotData.length; i++) {
- $(getItemSlotData[i]).click(function () {
- if (this.getAttribute('inv-type') != 'p') {
- return;
- }
- if (this.classList.contains('selected')) {
- this.classList.remove('selected');
- currentSelected = undefined;
- }
- else if (this.getAttribute('object') === 'false' && isNaN(currentSelected)) {
- return;
- }
- else if (currentSelected) {
- if (playerInventory[currentSelected].stackable === 'false' || playerInventory[currentSelected].itemId != playerInventory[this.getAttribute('data-value')].itemId) {
-
- if (playerInventory[this.getAttribute('data-value')] == EmptySlot && this.getAttribute('data-value') > 23 && currentSelected < 24) {
-
- var hItem = this.getAttribute('data-value');
- var iItem = currentSelected;
- var Copy = Object.assign({}, playerInventory[iItem]);
- playerInventory.splice(hItem, 0, Copy);
-
- if (playerInventory[currentSelected].stackable === 'false') {
- playerInventory[hItem].amount = playerInventory[iItem].amount;
- playerInventory[iItem] = EmptySlot;
- } else {
- $(".Betrag").show();
- $("#tf_submitZahl").click(function () {
-
- if ($('#tf_zahl').val() < playerInventory[iItem].amount && playerInventory[currentSelected].stackable) {
- console.log(playerInventory[hItem].amount + " " + playerInventory[iItem].amount + " " + hItem);
- var y = parseInt($('#tf_zahl').val(), 10);
-
- playerInventory[iItem].amount -= y;
- console.log(playerInventory[hItem].amount + " " + playerInventory[iItem] + " " + parseInt($('#tf_zahl').val(), 10) + " " + hItem);
- playerInventory[hItem].amount = y;
- console.log(playerInventory[hItem].amount + " " + playerInventory[iItem].amount + " " + parseInt($('#tf_zahl').val(), 10) + " " + hItem);
- } else {
- playerInventory[hItem].amount = playerInventory[iItem].amount;
- playerInventory[iItem] = EmptySlot;
- }
-
- drawToPage();
- drawToKofferraum();
- currentSelected = undefined;
- getItemSlotData = document.getElementsByClassName('itemSlot');
- moveItemsInv();
- $(".Betrag").hide();
- saveAllItems();
- });
- }
- return;
- } else {
- var swap = playerInventory[this.getAttribute('data-value')];
- playerInventory[this.getAttribute('data-value')] = playerInventory[currentSelected];
- playerInventory[currentSelected] = swap;
- drawToPage();
- drawToKofferraum();
- currentSelected = undefined;
- getItemSlotData = document.getElementsByClassName('itemSlot');
- moveItemsInv();
- }
-
- }
- else if ((playerInventory[currentSelected].itemId == playerInventory[this.getAttribute('data-value')].itemId && playerInventory[currentSelected].stackable) && this.getAttribute('inv-type') === 'p') {
- $(".Betrag").show();
- $("#tf_submitZahl").click(function () {
- playerInventory[this.getAttribute('data-value')].amount += playerInventory[currentSelected].amount
- playerInventory[currentSelected] = EmptySlot;
- drawToPage();
- drawToKofferraum();
- currentSelected = undefined;
- getItemSlotData = document.getElementsByClassName('itemSlot');
- moveItemsInv();
- $(".Betrag").hide();
- saveAllItems();
- });
- }
- }
- else {
- this.className += ' selected';
- currentSelected = this.getAttribute('data-value');
- }
- });
- }
-}
-//Inventar
-
-function saveAllItems() {
- mp.trigger("CEF:saveItemsHelper", JSON.stringify(vehId));
- for (var i = 0; i < playerInventory.length; i++) {
- if (playerInventory[i].object === 'true') {
- mp.trigger("CEF:saveItems", JSON.stringify(playerInventory[i].itemId), JSON.stringify(playerInventory[i].amount), JSON.stringify(i));
- }
- }
-
-}
-
-
-function refreshAllCurrentItems() {
- var remove = document.getElementById('invContainer');
- while (remove.firstChild) remove.removeChild(remove.firstChild);
-}
-
-
-function fillOutEmptyInv() {
- for (var i = 0; i < 24; i++) {
- if (!playerInventory[i]) {
- playerInventory.push(EmptySlot);
- drawToPage();
- }
- }
-}
-var weightInv = 0;
-function drawToPage() {
- refreshAllCurrentItems();
- weightInv = 0;
- for (var i = 0; i < playerInventory.length; i++) {
- if (playerInventory[i].selected == 'true') {
- var className = ' selected';
- }
- else {
- var className = '';
- }
-
- if (i >= 24) {
- //Keeps inventory set to 10 items max
- console.log('Inventory is full!')
- return;
- }
- else {
- //creates item element
- var item = document.createElement("div");
- item.className = "itemSlot " + playerInventory[i].rarity + className;
- item.setAttribute("data-value", i);
- item.setAttribute("inv-type", 'p');
- item.setAttribute("object", playerInventory[i].object);
- item.setAttribute('style', 'background: url(' + playerInventory[i].img + '); background-size: contain;');
-
- //show element amounts
- var itemAmount = document.createElement("div");
- itemAmount.className = "itemAmount";
- var itemAmountDisplay = document.createElement("p");
- if (playerInventory[i].amount) {
- var itemDisplayStatsName = document.createTextNode(playerInventory[i].amount);
- }
- else {
- var itemDisplayStatsName = document.createTextNode('');
- }
- item.appendChild(itemAmount);
- itemAmount.appendChild(itemAmountDisplay);
- itemAmountDisplay.appendChild(itemDisplayStatsName);
-
-
- //adds item element or elements
- document.getElementById("invContainer").appendChild(item);
-
- //creates item display information
- if (playerInventory[i].object === 'true') {
- var itemDesc = document.createElement("div");
- var itemDescTitle = document.createElement("h3");
-
- var getItemTitle = document.createTextNode(playerInventory[i].name + " (" + Math.round(playerInventory[i].currentWeight * playerInventory[i].amount * 100) / 100 + " kg)");
- itemDesc.className = "itemDesc";
- item.appendChild(itemDesc);
- itemDesc.appendChild(itemDescTitle);
- itemDescTitle.appendChild(getItemTitle);
-
- weightInv += playerInventory[i].currentWeight * playerInventory[i].amount;
- document.getElementById('gewicht').innerText = Math.round(weightInv * 100) / 100 + "/45 kg";
- }
- }
- }
- fillOutEmptyInv();
-}
-//Kofferraum
-
-function refreshAllCurrentKofItems() {
- var remove = document.getElementById('kofContainer');
- while (remove.firstChild) remove.removeChild(remove.firstChild);
-}
-
-
-function fillOutEmptyInvKofferraum() {
- for (var i = 24; i < 54; i++) {
- if (!playerInventory[i]) {
- playerInventory.push(EmptySlot);
- drawToKofferraum();
- }
- }
-}
-var vehWeightInv = 0;
-function drawToKofferraum() {
- refreshAllCurrentKofItems();
- vehWeightInv = 0;
- for (var i = 24; i < playerInventory.length; i++) {
- if (playerInventory[i].selected == 'true') {
- var className = ' selected';
- }
- else {
- var className = '';
- }
-
- if (i >= 54) {
- //Keeps inventory set to 10 items max
- console.log('Inventory is full!')
- return;
- }
- else {
- //creates item element
- var item = document.createElement("div");
- item.className = "itemSlot " + playerInventory[i].rarity + className;
- item.setAttribute("data-value", i);
- item.setAttribute("inv-type", 'p');
- item.setAttribute("object", playerInventory[i].object);
- item.setAttribute('style', 'background: url(' + playerInventory[i].img + '); background-size: contain;');
-
- //show element amounts
- var itemAmount = document.createElement("div");
- itemAmount.className = "itemAmount";
- var itemAmountDisplay = document.createElement("p");
- if (playerInventory[i].amount) {
- var itemDisplayStatsName = document.createTextNode(playerInventory[i].amount);
- }
- else {
- var itemDisplayStatsName = document.createTextNode('');
- }
- item.appendChild(itemAmount);
- itemAmount.appendChild(itemAmountDisplay);
- itemAmountDisplay.appendChild(itemDisplayStatsName);
-
-
- //adds item element or elements
- document.getElementById("kofContainer").appendChild(item);
-
- //creates item display information
- if (playerInventory[i].object === 'true') {
- var itemDesc = document.createElement("div");
- var itemDescTitle = document.createElement("h3");
-
- var getItemTitle = document.createTextNode(playerInventory[i].name + " (" + Math.round(playerInventory[i].currentWeight * playerInventory[i].amount * 100) / 100 + " kg)");
- itemDesc.className = "itemDesc";
- item.appendChild(itemDesc);
- itemDesc.appendChild(itemDescTitle);
- itemDescTitle.appendChild(getItemTitle);
-
- vehWeightInv += playerInventory[i].currentWeight * playerInventory[i].amount;
- document.getElementById('vehGewicht').innerText = Math.round(weightInv * 100) / 100 + "/250 kg";
- }
- }
- }
- fillOutEmptyInvKofferraum();
-}
-
-///////////////////
-// Dev Commands //
-///////////////////
-
-var commands = {
- addToPlayerInv: function (itemGiveId) {
- for (var i = 0; i < allItems.length; i++) {
- if (allItems[i].itemId === itemGiveId) {
- addToInvenotry(allItems[i]);
- }
- }
- },
- addToVehInv: function(itemGiveId) {
- for (var i = 0; i < allItems.length; i++) {
- if (allItems[i].itemId === itemGiveId) {
- addToVehInvenotry(allItems[i]);
- }
- }
- },
- clearPlayerInv: function () {
- playerInventory = [];
- drawToPage();
- drawToKofferraum();
- },
-}
-
-//Handel Akzeptierenfenster
-
-
-var trade = 1;
-$("#Fahrzeug").click(function () {
- if (trade == 1) {
- $(".fahrzeugWrapper").show();
- drawToKofferraum();
- drawToPage();
-
- moveItemsInv();
- trade = 0;
- } else {
- $(".fahrzeugWrapper").hide();
- trade = 1;
- }
- currentSelected = undefined;
-});
diff --git a/ReallifeGamemode.Client/assets/html/inventory/vehicle/style.css b/ReallifeGamemode.Client/assets/html/inventory/vehicle/style.css
deleted file mode 100644
index 5121bfd8..00000000
--- a/ReallifeGamemode.Client/assets/html/inventory/vehicle/style.css
+++ /dev/null
@@ -1,360 +0,0 @@
-/* *** FOR TESTING ONLY *** */
-.greyFont {
- color: gray;
- font-size: 14px;
- width: 250px;
-}
-
-body {
- overflow: hidden;
- font-family: 'Roboto', sans-serif;
- font-weight: 500;
- color: #222;
- margin: 0;
- padding: 0;
-}
-
-/* buttons */
-#buttonbenutzen {
- background-color: #4CAF50; /* gruen */
- border: none;
- color: white;
- padding: 12px 24px;
- text-align: center;
- text-decoration: none;
- display: inline-block;
- font-size: 16px;
- position: relative;
- left: 1.5%;
-}
-#buttonwegwerfen {
- background-color: #f44336; /* rot */
- border: none;
- color: white;
- padding: 12px 24px;
- text-align: center;
- text-decoration: none;
- display: inline-block;
- font-size: 16px;
- position: relative;
- left: 1.5%;
-}
-#buttonhandeln {
- background-color: #008CBA; /* blau */
- border: none;
- color: white;
- padding: 12px 24px;
- text-align: center;
- text-decoration: none;
- display: inline-block;
- font-size: 16px;
- position: relative;
- left: 1.5%;
-}
-#buttonablehnen {
- background-color: #f44336; /* rot */
- border: none;
- color: white;
- padding: 12px 24px;
- text-align: center;
- text-decoration: none;
- display: inline-block;
- font-size: 16px;
- position: relative;
- left: 18%;
-}
-#buttonakzeptieren {
- background-color: #008CBA; /* blau */
- border: none;
- color: white;
- padding: 12px 24px;
- text-align: center;
- text-decoration: none;
- display: inline-block;
- font-size: 16px;
- position: relative;
- left: 18%;
-}
-#Fahrzeug {
- background-color: #008CBA; /* blau */
- border: none;
- color: white;
- padding: 12px 24px;
- text-align: center;
- text-decoration: none;
- display: inline-block;
- font-size: 16px;
- position: relative;
- left: 1.5%;
-}
-
-button {
- width: 125px;
- background-color: lightGrey;
- padding: 5px;
- margin: 2px 0px;
- border: none;
- cursor: pointer;
-}
-
-button:hover {
- background-color: grey;
-}
-
-h2 {
- font-family: 'Roboto', sans-serif;
- font-weight: 700;
- font-size: 18px;
- color: white;
- margin:5px;
- padding: 5px;
- border: 1px solid #808080;
- width: 20.75em;
-}
-.box1 {
- float: left;
- width: 50%;
-}
-.box2 {
-
- padding: 2px;
- padding-bottom:30px;
-
- }
-
-h4 {
- font-family: 'Roboto', sans-serif;
- font-weight: 700;
- font-size: 18px;
- color: white;
- margin:5px;
- padding: 5px;
- text-align:right;
- border: none;
-}
-
-.pakWrapper {
- background: rgba(0,0,0,0.4);
- height: 170px;
- width: 394px;
- display: block;
- padding: 5px;
- position: absolute;
- left: 38%;
- top: 35%;
-}
-
-.pInvWrapper {
- background: rgba(0,0,0,0.6);
- height: 395px;
- width: 394px;
- display: block;
- padding: 5px;
- position: absolute;
- left: 10%;
-}
-
-.pKofWrapper {
- background: rgba(0,0,0,0.6);
- height: 395px;
- width: 394px;
- display: block;
- padding: 5px;
- position: absolute;
- left: 40%;
-
-}
-
-.fahrzeugWrapper {
- background: rgba(0,0,0,0.6);
- height: 395px;
- width: 394px;
- display: block;
- padding: 5px;
- position: absolute;
- left: 40%;
- top: 50%;
-}
-
-#invContainer{
- width: 110%;
- height: auto;
-}
-
-#invContainer h3 {
- padding: 0px 10px;
-}
-
-#kofContainer{
- width: 110%;
- height: auto;
-}
-
-#kofContainer h3 {
- padding: 0px 10px;
-}
-
-#fahrzeugContainer{
- width: 110%;
- height: auto;
-}
-
-#fahrzeugContainer h3 {
- padding: 0px 10px;
-}
-
-.itemSlot {
- width: 54px;
- height: 54px;
- margin: 5px;
- float: left;
- border: 1px solid #808080;
- border-radius: 5px;
- position: relative;
- cursor: pointer;
-}
-
-.itemSlot:hover {
- border: 1px solid #999999;
-}
-
-.itemAmount p {
- color: white;
- font-family: 'Roboto', sans-serif;
- font-weight: 700;
- text-shadow: 0px 0px 2px black;
- position: absolute;
- top: 16px;
- left: 4px;
-}
-
-
-.selected {
- box-shadow: 0px 0px 6px white;
- border: 1px solid yellow;
-}
-
-.common {
- box-shadow: 0 0 2px 1px white inset;
-}
-
-.common h3 {
- color: white;
- text-shadow: 0 0 0 1px black;
-}
-
-.uncommon {
- box-shadow: 0 0 2px 1px #3333ff inset;
-}
-
-.uncommon h3 {
- color: #3333ff;
- text-shadow: 0 0 0 1px black;
-}
-
-.rare {
- box-shadow: 0 0 2px 1px #66ff33 inset;
-}
-
-.rare h3 {
- color: #66ff33;
- text-shadow: 0 0 0 1px black;
-}
-
-.superior {
- box-shadow: 0 0 3px 1px #990099 inset;
-}
-
-.superior h3 {
- color: #990099;
- text-shadow: 0px 0px 1px black;
-}
-
-.mythic {
- box-shadow: 0 0 3px 1px #ffa333 inset;
-}
-
-.mythic h3 {
- color: #ffa333;
- text-shadow: 0px 0px 1px black;
-}
-
-.pForgeWrapper {
- background: #222;
- height: 176px;
- width: 330px;
- display: block;
- padding: 5px;
- position: absolute;
- left: 0;
- top: 0;
-}
-
-/*item description */
-.itemSlot:hover > .itemDesc {
- display: block;
-}
-
-.itemDesc {
- width: 250px;
- height: auto;
- top: 60px;
- border: 1px solid #808080;
- border-radius: 5px;
- background: #1a1a1a;
- position: absolute;
- display: none;
- z-index: 9999;
-}
-
-.itemDesc p{
- color: white;
-}
-/*Handelfenster */
-.Betrag {
- background: rgba(0,0,0,0.6);
- height: 100%;
- width: 100%;
- display: block;
- transform: translate(-50%, -50%);
- position: absolute;
- left: 50%;
- top: 50%;
-}
-
-#tf_betrag {
- background-color: #008CBA; /* blau */
- border: none;
- height: 30px;
- width: 124px;
- text-align: center;
- text-decoration: none;
- display: inline-block;
- font-size: 16px;
- font-color: white;
- position: relative;
- left: 1.5%;
- color:#ffffff;
-}
-::placeholder {
- color: white;
- opacity: 1;
-}
-#tf_submit {
- background-color: #008CBA; /* blau */
- border: none;
- height: 32px;
- width: 124px;
- text-align: center;
- text-decoration: none;
- display: inline-block;
- font-size: 16px;
- font-color: white;
- position: relative;
- left: 1.5%;
- color:#ffffff;
-}
-
-
-
-/* tasks */
\ No newline at end of file
diff --git a/ReallifeGamemode.Client/assets/js/inventory/script.js b/ReallifeGamemode.Client/assets/js/inventory/script.js
deleted file mode 100644
index 5ce4699a..00000000
--- a/ReallifeGamemode.Client/assets/js/inventory/script.js
+++ /dev/null
@@ -1,619 +0,0 @@
-
-
-$(document).ready(function () {
- //fire functions before page load
- drawToPage();
- moveItemsInv();
- console.log("loading finished");
- mp.trigger("CEF:BrowserLoaded");
-});
-
-function setItems(itemIdArr1, itemAmountArr1) {
- var itemIdArr = JSON.parse(itemIdArr1);
- var itemAmountArr = JSON.parse(itemAmountArr1);
- for (var i = 0; i < itemIdArr.length; i++) {
- for (x = 0; x < itemAmountArr[i]; x++) {
- commands.addToPlayerInv(itemIdArr[i]);
- console.log(i);
- }
- }
-}
-
-
-var holz = {
- name: "Holz",
- rarity: 'common',
- selected: 'false',
- usable: 'true',
- amount: 1,
- currentWeight: 0.65,
- stackable: 'true',
- object: 'true',
- itemId: 1,
- img: "package://assets/img/items/wood.svg"
-}
-var hamburger = {
- name: "Hamburger",
- rarity: 'common',
- selected: 'false',
- usable: 'true',
- amount: 1,
- currentWeight: 0.3,
- stackable: 'true',
- object: 'true',
- itemId: 2,
- img: "package://assets/img/items/burger.svg"
-}
-var cocaine = {
- name: "Koks",
- rarity: 'common',
- selected: 'false',
- usable: 'true',
- amount: 1,
- currentWeight: 0.05,
- stackable: 'true',
- object: 'true',
- itemId: 3,
- img: "package://assets/img/items/cocaine.svg"
-}
-var cannabis = {
- name: "Cannabis",
- rarity: 'common',
- selected: 'false',
- usable: 'true',
- amount: 1,
- currentWeight: 0.05,
- stackable: 'true',
- object: 'true',
- itemId: 4,
- img: "package://assets/img/items/cannabis.svg"
-}
-var flunder = {
- name: "Flunder",
- weight: 7.7,
- currentWeight: 7.7,
- rarity: 'fishes',
- statSlots: [],
- runes: [],
- amount: 1,
- usable: 'false',
- selected: 'false',
- stackable: 'false',
- object: 'true',
- itemId: 5,
- img: 'package://assets/img/items/flounder.svg'
-}
-var aal = {
- name: "Aal",
- weight: 3.6,
- currentWeight: 3.6,
- rarity: 'fishes',
- statSlots: [],
- runes: [],
- amount: 1,
- usable: 'false',
- selected: 'false',
- stackable: 'false',
- object: 'true',
- itemId: 6,
- img: 'package://assets/img/items/aal.svg'
-}
-var barsch = {
- name: "Barsch",
- weight: 2.6,
- currentWeight: 2.6,
- rarity: 'fishes',
- statSlots: [],
- runes: [],
- amount: 1,
- usable: 'false',
- selected: 'false',
- stackable: 'false',
- object: 'true',
- itemId: 7,
- img: 'package://assets/img/items/perch.svg'
-}
-var lachs = {
- name: "Lachs",
- weight: 4.2,
- currentWeight: 4.2,
- rarity: 'fishes',
- statSlots: [],
- runes: [],
- amount: 1,
- usable: 'false',
- selected: 'false',
- stackable: 'false',
- object: 'true',
- itemId: 8,
- img: 'package://assets/img/items/salmon.svg'
-}
-var thunfisch = {
- name: "Thunfisch",
- weight: 11,
- currentWeight: 11,
- rarity: 'fishes',
- statSlots: [],
- runes: [],
- amount: 1,
- usable: 'false',
- selected: 'false',
- stackable: 'false',
- object: 'true',
- itemId: 9,
- img: 'package://assets/img/items/salmon.svg'
-}
-var zander = {
- name: "Zander",
- weight: 5,
- currentWeight: 5,
- rarity: 'fishes',
- statSlots: [],
- runes: [],
- amount: 1,
- usable: 'false',
- selected: 'false',
- stackable: 'false',
- object: 'true',
- itemId: 10,
- img: 'package://assets/img/items/zander.svg'
-}
-
-var allItems = [holz, hamburger, cocaine, cannabis, flunder, aal, barsch, lachs, thunfisch, zander];
-
-
-
-////////////////////////
-// Player Invenotry //
-////////////////////////
-
-var playerInventory = [];
-var EmptySlot = { name: 'blankSpace', rarity: '', object: 'false' };
-
-
-function addToInvenotry(addItem) {
- var cloneItem = Object.assign({}, addItem);
- var getExsistingId = cloneItem.itemId;
- var unfininshedStack;
-
-
- //Checks to see if any items can be stacked, the location, and stack amount
- for (var i = 0; i < playerInventory.length; i++) {
- if (playerInventory[i].itemId === getExsistingId && cloneItem.stackable === 'true' && playerInventory[i].amount < 10) {
- unfininshedStack = i
- break;
- }
- }
- if (cloneItem.currentWeight * cloneItem.amount + weightInv >= 45) {
- return;
- }
-
- //Adds item to inventory
- for (var i = 0; i < playerInventory.length; i++) {
- if (unfininshedStack != undefined) {
- if (playerInventory[unfininshedStack].amount + cloneItem.amount <= 10) {
- playerInventory[unfininshedStack].amount += cloneItem.amount;
- unfininshedStack = undefined;
- drawToPage();
- moveItemsInv();
- break;
- }
- else if (playerInventory[unfininshedStack].amount + cloneItem.amount > 10) {
- var stackRemainder = 10 - playerInventory[unfininshedStack].amount;
- playerInventory[unfininshedStack].amount += stackRemainder;
- cloneItem.amount -= stackRemainder;
- var recycleCloned = cloneItem;
- addToInvenotry(recycleCloned);
- unfininshedStack = undefined;
- drawToPage();
- moveItemsInv();
- break;
- }
- }
- else if (cloneItem.amount > 10 && playerInventory[i].object === 'false') {
- var reduceCloneAmount = Object.assign({}, cloneItem);
- reduceCloneAmount.amount = 10;
- playerInventory[i] = reduceCloneAmount;
- cloneItem.amount -= 10;
- addToInvenotry(cloneItem);
- drawToPage();
- moveItemsInv();
- break;
- }
- else if (unfininshedStack == undefined && playerInventory[i].object === 'false') {
- playerInventory[i] = cloneItem;
- drawToPage();
- moveItemsInv();
- break;
- }
- }
-}
-
-var getItemSlotData;
-function getAllItemSlotData() {
- getItemSlotData = document.getElementsByClassName('itemSlot');
-}
-
-
-var currentSelected;
-function moveItemsInv() {
- getAllItemSlotData();
- for (var i = 0; i < getItemSlotData.length; i++) {
- $(getItemSlotData[i]).click(function () {
- if (this.getAttribute('inv-type') != 'p') {
- return;
- }
- if (this.classList.contains('selected')) {
- this.classList.remove('selected');
- currentSelected = undefined;
- }
- else if (this.getAttribute('object') === 'false' && isNaN(currentSelected)) {
- return;
- }
- else if (currentSelected) {
- if (playerInventory[currentSelected].stackable === 'false' || playerInventory[currentSelected].itemId != playerInventory[this.getAttribute('data-value')].itemId) {
-
- if (playerInventory[this.getAttribute('data-value')] == EmptySlot && this.getAttribute('data-value') > 23) {
-
- var hItem = this.getAttribute('data-value');
- var iItem = currentSelected;
- var Copy = Object.assign({}, playerInventory[iItem]);
- playerInventory.splice(hItem, 0, Copy);
- $(".Betrag").show();
- $("#tf_submitZahl").click(function () {
-
- if ($('#tf_zahl').val() < playerInventory[iItem].amount && playerInventory[currentSelected].stackable) {
- console.log(playerInventory[hItem].amount + " " + playerInventory[iItem].amount + " " + hItem);
- var y = parseInt($('#tf_zahl').val(), 10);
-
- playerInventory[iItem].amount -= y;
- console.log(playerInventory[hItem].amount + " " + playerInventory[iItem] + " " + parseInt($('#tf_zahl').val(), 10) + " " + hItem);
- playerInventory[hItem].amount = y;
- console.log(playerInventory[hItem].amount + " " + playerInventory[iItem].amount + " " + parseInt($('#tf_zahl').val(), 10) + " " + hItem);
- } else {
- playerInventory[hItem].amount = playerInventory[iItem].amount;
- playerInventory[iItem] = EmptySlot;
- }
-
- drawToPage();
- drawToHandel();
- currentSelected = undefined;
- getItemSlotData = document.getElementsByClassName('itemSlot');
- moveItemsInv();
- $(".Betrag").hide();
- });
- return;
- } else {
- var swap = playerInventory[this.getAttribute('data-value')];
- playerInventory[this.getAttribute('data-value')] = playerInventory[currentSelected];
- playerInventory[currentSelected] = swap;
- drawToPage();
- drawToHandel();
- currentSelected = undefined;
- getItemSlotData = document.getElementsByClassName('itemSlot');
- moveItemsInv();
- }
-
- }
- else if ((playerInventory[currentSelected].itemId == playerInventory[this.getAttribute('data-value')].itemId && playerInventory[currentSelected].stackable) && this.getAttribute('inv-type') === 'p') {
-
- playerInventory[this.getAttribute('data-value')].amount += playerInventory[currentSelected].amount
- playerInventory[currentSelected] = EmptySlot;
- drawToPage();
- drawToHandel();
- currentSelected = undefined;
- getItemSlotData = document.getElementsByClassName('itemSlot');
- moveItemsInv();
- }
- }
- else {
- this.className += ' selected';
- currentSelected = this.getAttribute('data-value');
- }
- });
- }
-}
-
-function refreshAllCurrentItems() {
- var remove = document.getElementById('invContainer');
- while (remove.firstChild) remove.removeChild(remove.firstChild);
-}
-
-
-function fillOutEmptyInv() {
- for (var i = 0; i < 24; i++) {
- if (!playerInventory[i]) {
- playerInventory.push(EmptySlot);
- drawToPage();
- }
- }
-}
-var weightInv = 0;
-function drawToPage() {
- refreshAllCurrentItems();
- weightInv = 0;
- document.getElementById('gewicht').innerText = "0/45 kg";
- for (var i = 0; i < playerInventory.length; i++) {
- if (playerInventory[i].selected == 'true') {
- var className = ' selected';
- }
- else {
- var className = '';
- }
-
- if (i >= 24) {
- //Keeps inventory set to 10 items max
- console.log('Inventory is full!')
-
- }
- else {
- //creates item element
- var item = document.createElement("div");
- item.className = "itemSlot " + playerInventory[i].rarity + className;
- item.setAttribute("data-value", i);
- item.setAttribute("inv-type", 'p');
- item.setAttribute("object", playerInventory[i].object);
- item.setAttribute('style', 'background: url(' + playerInventory[i].img + '); background-size: contain;');
-
- //show element amounts
- var itemAmount = document.createElement("div");
- itemAmount.className = "itemAmount";
- var itemAmountDisplay = document.createElement("p");
- if (playerInventory[i].amount) {
- var itemDisplayStatsName = document.createTextNode(playerInventory[i].amount);
- }
- else {
- var itemDisplayStatsName = document.createTextNode('');
- }
- item.appendChild(itemAmount);
- itemAmount.appendChild(itemAmountDisplay);
- itemAmountDisplay.appendChild(itemDisplayStatsName);
-
-
- //adds item element or elements
- document.getElementById("invContainer").appendChild(item);
-
- //creates item display information
- if (playerInventory[i].object === 'true') {
- var itemDesc = document.createElement("div");
- var itemDescTitle = document.createElement("h3");
-
- var getItemTitle = document.createTextNode(playerInventory[i].name + " (" + Math.round(playerInventory[i].currentWeight * playerInventory[i].amount * 100) / 100 + " kg)");
- itemDesc.className = "itemDesc";
- item.appendChild(itemDesc);
- itemDesc.appendChild(itemDescTitle);
- itemDescTitle.appendChild(getItemTitle);
-
- weightInv += playerInventory[i].currentWeight * playerInventory[i].amount;
- document.getElementById('gewicht').innerText = Math.round(weightInv * 100) / 100 + "/45 kg";
- }
- }
- }
- fillOutEmptyInv();
-}
-
-function refreshAllCurrentHandelItems() {
- var remove = document.getElementById('handelContainer');
- while (remove.firstChild) remove.removeChild(remove.firstChild);
-}
-
-
-function fillOutEmptyInvHandel() {
- for (var i = 24; i < 30; i++) {
- if (!playerInventory[i]) {
- playerInventory.push(EmptySlot);
- drawToHandel();
- }
- }
-}
-
-function drawToHandel() {
- refreshAllCurrentHandelItems();
- for (var i = 24; i < playerInventory.length; i++) {
- if (playerInventory[i].selected == 'true') {
- var className = ' selected';
- }
- else {
- var className = '';
- }
-
- if (i >= 30) {
- //Keeps inventory set to 10 items max
- console.log('Inventory is full!')
- return;
- }
- else {
- //creates item element
- var item = document.createElement("div");
- item.className = "itemSlot " + playerInventory[i].rarity + className;
- item.setAttribute("data-value", i);
- item.setAttribute("inv-type", 'p');
- item.setAttribute("object", playerInventory[i].object);
- item.setAttribute('style', 'background: url(' + playerInventory[i].img + '); background-size: contain;');
-
- //show element amounts
- var itemAmount = document.createElement("div");
- itemAmount.className = "itemAmount";
- var itemAmountDisplay = document.createElement("p");
- if (playerInventory[i].amount) {
- var itemDisplayStatsName = document.createTextNode(playerInventory[i].amount);
- }
- else {
- var itemDisplayStatsName = document.createTextNode('');
- }
- item.appendChild(itemAmount);
- itemAmount.appendChild(itemAmountDisplay);
- itemAmountDisplay.appendChild(itemDisplayStatsName);
-
-
- //adds item element or elements
- document.getElementById("handelContainer").appendChild(item);
-
- if (playerInventory[i].object === 'true') {
- var itemDesc = document.createElement("div");
- var itemDescTitle = document.createElement("h3");
-
- var getItemTitle = document.createTextNode(playerInventory[i].name + " (" + Math.round(playerInventory[i].currentWeight * playerInventory[i].amount * 100) / 100 + " kg)");
- itemDesc.className = "itemDesc";
- item.appendChild(itemDesc);
- itemDesc.appendChild(itemDescTitle);
- itemDescTitle.appendChild(getItemTitle);
- }
-
- }
-
- }
- fillOutEmptyInvHandel();
-}
-
-///////////////////
-// Dev Commands //
-///////////////////
-
-var commands = {
- addToPlayerInv: function (itemGiveId) {
- for (var i = 0; i < allItems.length; i++) {
- if (allItems[i].itemId === itemGiveId) {
- addToInvenotry(allItems[i]);
- }
- }
- },
- clearPlayerInv: function () {
- playerInventory = [];
- drawToPage();
- drawToHandel();
- },
-}
-
-
-// Button funktionen
-
-
-$("#buttonbenutzen").click(function () {
- if (currentSelected) {
- if (playerInventory[currentSelected].usable == 'true') {
- if (playerInventory[currentSelected].stackable == 'true') {
- playerInventory[currentSelected].amount -= 1;
- if (playerInventory[currentSelected].amount <= 0) {
- mp.trigger("CEF:UseItemInv", playerInventory[currentSelected].itemId);
- playerInventory[currentSelected] = EmptySlot;
- } else {
- if (getItemSlotData[currentSelected].classList.contains('selected')) {
- getItemSlotData[currentSelected].classList.remove('selected');
- playerInventory[currentSelected].selected = 'false';
- }
- }
- drawToPage();
- drawToHandel();
- moveItemsInv();
- } else {
- mp.trigger("CEF:UseItemInv", playerInventory[currentSelected].itemId);
- playerInventory[currentSelected] = EmptySlot;
- drawToPage();
- drawToHandel();
- moveItemsInv();
- }
-
- currentSelected = undefined;
- }
- }
-});
-
-
-$("#buttonwegwerfen").click(function () {
- if (currentSelected) {
-
- if (playerInventory[currentSelected].stackable == 'false') {
- mp.trigger('CEF:invThrowItem', playerInventory[currentSelected].itemId, playerInventory[currentSelected].amount);
- weightInv -= playerInventory[currentSelected].weight;
- playerInventory[currentSelected] = EmptySlot;
- currentSelected = undefined;
- drawToPage();
- drawToHandel();
- moveItemsInv();
- return;
- }
-
- $(".Betrag").show();
- var iItem = currentSelected;
- $("#tf_submitZahl").click(function () {
-
- if ($('#tf_zahl').val() < playerInventory[iItem].amount && playerInventory[currentSelected].stackable) {
- var y = parseInt($('#tf_zahl').val(), 10);
-
- playerInventory[iItem].amount -= y;
- mp.trigger('CEF:invThrowItem', playerInventory[currentSelected].itemId, y);
- } else {
- mp.trigger('CEF:invThrowItem', playerInventory[currentSelected].itemId, playerInventory[currentSelected].amount);
- playerInventory[iItem] = EmptySlot;
- }
- $(".Betrag").hide();
- currentSelected = undefined;
- drawToPage();
- drawToHandel();
- moveItemsInv();
-
- });
- }
-});
-
-
-var trade = 1;
-$("#buttonhandeln").click(function () {
- if (trade == 1) {
- $(".phanWrapper").show();
-
- drawToPage();
- drawToHandel();
- moveItemsInv();
- trade = 0;
- } else {
- $(".phanWrapper").hide();
- trade = 1;
- }
- currentSelected = undefined;
-});
-
-$("#tf_submit").click(function () {
- var Money = document.getElementById("tf_betrag").value;
- var User = document.getElementById("tf_name").value;
- if (User == '') {
- return;
- }
- if (Money == '') {
- getTradeSlotItems();
- playerInventory[currentSelected] = EmptySlot;
- currentSelected = undefined;
- drawToPage();
- drawToHandel();
- moveItemsInv();
-
- mp.trigger("CEF:tradeItem", 0, User, JSON.stringify(tradeItems), JSON.stringify(tradeItemAmount));
- return;
- }
- getTradeSlotItems();
- playerInventory[currentSelected] = EmptySlot;
- currentSelected = undefined;
- drawToPage();
- drawToHandel();
- moveItemsInv();
- mp.trigger("CEF:tradeItem", $('#tf_betrag').val(), User, JSON.stringify(tradeItems), JSON.stringify(tradeItemAmount));
- return;
-});
-var tradeItems = [];
-var tradeItemAmount = [];
-function getTradeSlotItems() {
- tradeItems = [];
- tradeItemAmount = [];
- for (var i = 24; i < playerInventory.length; i++) {
- if (playerInventory[i].object == 'true') {
- for (var x = 0; x < allItems.length; x++) {
- if (playerInventory[i].itemId == allItems[x].itemId) {
- tradeItems.push(playerInventory[i].itemId);
- tradeItemAmount.push(playerInventory[i].amount);
- }
- }
- }
- }
-}
-
diff --git a/ReallifeGamemode.Client/inventory/inventory.ts b/ReallifeGamemode.Client/inventory/inventory.ts
index 004186c7..c7877470 100644
--- a/ReallifeGamemode.Client/inventory/inventory.ts
+++ b/ReallifeGamemode.Client/inventory/inventory.ts
@@ -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) {
diff --git a/ReallifeGamemode.Server/Entities/VehicleInventory.cs b/ReallifeGamemode.Server/Entities/VehicleInventory.cs
new file mode 100644
index 00000000..b06e3543
--- /dev/null
+++ b/ReallifeGamemode.Server/Entities/VehicleInventory.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace ReallifeGamemode.Server.Entities
+{
+ public class VehicleInventory
+ {
+ public int ID;
+ public int currentWeight;
+ public int totalWeight;
+ public string[] ivehName;
+ public int[] ivehAmount;
+ public int[] ivehId;
+
+
+ }
+}
diff --git a/ReallifeGamemode.Server/Events/Inventory.cs b/ReallifeGamemode.Server/Events/Inventory.cs
new file mode 100644
index 00000000..9a859d07
--- /dev/null
+++ b/ReallifeGamemode.Server/Events/Inventory.cs
@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using GTANetworkAPI;
+using ReallifeGamemode.Server.Entities;
+using ReallifeGamemode.Server.Extensions;
+using ReallifeGamemode.Server.Inventory.Interfaces;
+using ReallifeGamemode.Server.Managers;
+using ReallifeGamemode.Server.Models;
+using ReallifeGamemode.Server.Util;
+
+namespace ReallifeGamemode.Server.Events
+{
+ public class Inventory : Script
+ {
+ [RemoteEvent("getNearVehicles")]
+ public void SrvEvent_GetNearVehicles(Client client)
+ {
+ var user = client.GetUser();
+ var inventoryWeight = 0;
+ List
-
-
-
- Inventar
0/45kg
-
-
-
-
-
-
-