Revert "try to Fix TradeTimer"

This reverts commit 54350c98bb.
This commit is contained in:
hydrant
2019-07-28 21:13:37 +02:00
parent 7cf16fe5e4
commit f998bff611
14 changed files with 1781 additions and 6 deletions

View File

@@ -0,0 +1,327 @@
/* *** FOR TESTING ONLY *** */
.greyFont {
color: gray;
font-size: 14px;
width: 250px;
}
#commandOpts {
width: 250px;
height: 50px;
overflow: hidden;
overflow-y: scroll;
}
#commandOpts li{
cursor: pointer;
}
/* *** FOR TESTING ONLY *** */
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%;
}
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;
}
.left { text-align: left; }
.right { text-align: right; }
h4 {
font-family: 'Roboto', sans-serif;
font-weight: 700;
font-size: 18px;
color: white;
margin:5px;
padding: 5px;
text-align:right;
border: none;
}
h3 {
font-family: 'Roboto', sans-serif;
font-weight: 700;
font-size: 16px;
padding: 0px 0px;
}
h5 {
font-family: 'Roboto', sans-serif;
font-weight: 700;
font-size: 18px;
color: white;
margin:5px;
padding: 5px;
border: 1px solid #808080;
width: 20.75em;
}
.pInvWrapper {
background: rgba(0,0,0,0.4);
height: 395px;
width: 394px;
display: block;
padding: 5px;
position: absolute;
left: 38%;
top: 0;
}
.pInvWrapper {
background: rgba(0,0,0,0.4);
height: 395px;
width: 394px;
display: block;
padding: 5px;
position: absolute;
left: 38%;
top: 0;
}
.phanWrapper {
background: rgba(0,0,0,0.4);
height: 170px;
width: 394px;
display: block;
padding: 5px;
position: absolute;
left: 38%;
top: 50%;
}
#invContainer{
width: 110%;
height: auto;
}
#handelContainer{
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: #313131; /* blau */
border: none;
height: 30px;
width: 124px;
text-align: center;
text-decoration: none;
display: inline-block;
font-size: 12px;
position: relative;
left: 1.5%;
color:#ffffff;
}
#tf_name {
background-color: #313131; /* blau */
border: none;
height: 30px;
width: 124px;
text-align: center;
text-decoration: none;
display: inline-block;
font-size: 12px;
position: relative;
left: 1.5%;
color: #ffffff;
}
::placeholder {
color: #696969;
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 */

View File

@@ -0,0 +1,30 @@
<!DOCTYPE html>
<html lang="en" >
<head>
<meta charset="UTF-8">
<title>Inventory</title>
<link rel="stylesheet" href="./style.css">
</head>
<!-- partial:index.partial.html -->
<script src="./script.js"></script>
<head>
</head>
<body>
<div class="pakWrapper">
<div>
<div class=box1><h2> Handel Akzeptieren</h2></div>
<div class=box2><h4 id="gewicht"> Preis: 0$</h4></div>
</div>
<div id="invContainer">
</div>
<button id='buttonakzeptieren' onclick="akzeptieren()">Akzeptieren</button>
<button id='buttonablehnen' onclick="ablehnen()">Ablehnen</button>
</div>
<script src="package://assets/js/jquery-3.3.1.min.js" type="text/javascript"></script>
<script src="./script.js"></script>
</body>
</html>

View File

@@ -0,0 +1,312 @@
$(document).ready(function () {
//fire functions before page load
drawToPage();
moveItemsInv();
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 fish = {
name: "Fisch",
weight: 1,
currentWeight: 1,
dropweight: function () {
var randomweight = Math.floor((Math.random() * 10) + 1);
this.weight = randomweight;
this.currentWeight = randomweight;
},
def: 15,
rarity: 'common',
statSlots: [],
runes: [],
amount: 1,
usable: 'false',
selected: 'false',
stackable: 'false',
object: 'true',
itemId: 1,
img: 'package://assets/img/items/fish.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 allItems = [fish, hamburger, cocaine, cannabis];
////////////////////////
// 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();
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].addEventListener("click", function () {
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) {
var swap = playerInventory[this.getAttribute('data-value')];
playerInventory[this.getAttribute('data-value')] = playerInventory[currentSelected];
playerInventory[currentSelected] = swap;
drawToPage();
currentSelected = undefined;
getItemSlotData = document.getElementsByClassName('itemSlot');
moveItemsInv();
}
else if (playerInventory[currentSelected].itemId == playerInventory[this.getAttribute('data-value')].itemId && playerInventory[currentSelected].stackable) {
playerInventory[this.getAttribute('data-value')].amount += playerInventory[currentSelected].amount
playerInventory[currentSelected] = EmptySlot;
drawToPage();
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 < 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();
},
}
// Button funktionen
var elemakzeptieren = document.getElementById("buttonakzeptieren");
elemakzeptieren.addEventListener('click', akzeptieren);
var elemablehnen = document.getElementById("buttonablehnen");
elemablehnen.addEventListener('click', ablehnen);
//Handel Akzeptierenfenster
function akzeptieren() {
mp.trigger('CEF:acceptTrade');
}
function ablehnen() {
mp.trigger('CEF:declineTrade');
}

View File

@@ -0,0 +1,284 @@
/* *** 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 */

View File

@@ -0,0 +1,55 @@
<!DOCTYPE html>
<html lang="en" >
<head>
<meta charset="UTF-8">
<title>Inventory</title>
<link rel="stylesheet" href="package://assets/css/inventory/style.css">
</head>
<!-- partial:index.partial.html -->
<body>
<div class="pInvWrapper">
<div>
<div class=box1><h2> Inventar</h2></div>
<div class=box2><h4 id="gewicht"> 0/25 kg</h4></div>
</div>
<br>
<p>
<div id="invContainer">
</div>
<button id='buttonbenutzen' onclick="benutzen()">Benutzen</button>
<button id='buttonwegwerfen' onclick="wegwerfen()">Wegwerfen</button>
<button id='buttonhandeln' onclick="handeln()">Handeln</button>
</div>
<div class="phanWrapper">
<div><h2> Handel</h2></div>
<div id="handelContainer">
</div>
<input type="text" id="tf_betrag" name="fnumber" placeholder="Betrag eingeben" min="1" step="1" oninput="this.value=this.value.replace(/[^0-9]/g,'');">
<input type="text" id="tf_name" placeholder="Spielername">
<button id='tf_submit' onclick="submit()">Handeln</button>
</div>
<!-- Task Systems -->
<div class="tasksWrapper">
<div id="tasksContainer">
<div id="taskOneElem">
</div>
</div>
</div><br />
<!-- partial -->
<script src="package://assets/js/jquery-3.3.1.min.js" type="text/javascript"></script>
<script src="package://assets/js/inventory/script.js" type="text/javascript"></script>
</body>
</html>

View File

@@ -0,0 +1,101 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
<path style="fill:#884D00;" d="M483.199,301.788c0,9.253-3.747,17.622-9.805,23.68c-6.068,6.058-14.437,9.805-23.68,9.805H62.285
c-18.486,0-33.485-14.988-33.485-33.485c0-4.955,1.072-9.649,2.998-13.875c1.676-3.674,3.987-6.984,6.807-9.805
c6.068-6.058,14.437-9.805,23.68-9.805h387.43c13.542,0,25.21,8.035,30.487,19.61C482.127,292.139,483.199,296.833,483.199,301.788z
"/>
<path style="fill:#AA6100;" d="M480.202,287.913c-1.676,3.664-3.997,6.984-6.807,9.795c-6.068,6.058-14.437,9.805-23.68,9.805
H62.285c-13.531,0-25.199-8.035-30.487-19.599c1.676-3.674,3.986-6.984,6.807-9.805c6.068-6.058,14.437-9.805,23.68-9.805h387.43
C463.256,268.303,474.924,276.339,480.202,287.913z"/>
<path style="fill:#FFA733;" d="M512,362.303c0,43.144-19.974,75.202-52.262,96.467c-32.298,21.275-76.909,31.757-126.184,31.757
H178.445C79.897,490.527,0,448.591,0,362.303c0-4.809,1.197-9.368,3.362-13.469c1.832-3.497,4.361-6.651,7.432-9.337
c6.662-5.839,15.884-9.451,26.053-9.451h438.307c14.853,0,27.656,7.702,33.485,18.788C510.803,352.936,512,357.495,512,362.303z"/>
<path style="fill:#FFB655;" d="M508.638,348.835c-6.953,28.728-24.377,51.106-48.9,67.26
c-32.298,21.275-76.909,31.757-126.184,31.757H178.445c-86.704,0-158.96-32.454-175.083-99.017c1.832-3.497,4.361-6.651,7.432-9.337
c6.662-5.839,15.884-9.451,26.053-9.451h438.307C490.007,330.047,502.809,337.75,508.638,348.835z"/>
<path style="fill:#EEBF00;" d="M398.387,254.252l-86.621,86.621c-2.175,2.165-4.497,4.08-6.953,5.735
c-18.34,12.417-43.466,10.513-59.714-5.735l-86.621-86.621L398.387,254.252L398.387,254.252z"/>
<path style="fill:#FFD422;" d="M398.387,254.252l-86.621,86.621c-2.175,2.165-4.497,4.08-6.953,5.735
c-6.609-2.248-12.813-6.006-18.08-11.283l-81.073-81.073H398.387z"/>
<path style="fill:#6DC82A;" d="M502.278,266.336c0,4.538-0.749,9.18-2.373,13.708c-6.36,17.747-23.388,24.637-36.659,14.832
l-15.915-11.751c-11.106-8.212-25.272-4.85-33.308,7.911l-0.677,1.072c-7.713,12.261-21.161,15.904-32.142,8.722l-35.639-23.305
c-8.223-5.371-18.08-4.788-25.865,1.551l-28.561,23.232c-8.202,6.672-18.652,6.953-27.073,0.718l-32.579-24.148
c-8.327-6.172-18.652-5.975-26.823,0.52L175,302.954c-7.963,6.318-17.976,6.682-26.209,0.968l-38.408-26.688
c-7.557-5.246-16.664-5.392-24.325-0.385l-35.826,23.43c-23.857,3.071-35.462-14.447-35.462-14.447
c-5.714-9.93-6.287-21.702-3.195-31.58c3.674-11.803,12.574-20.9,24.148-20.9h440.566c11.345,0,20.411,8.962,24.138,20.848
C501.633,258.009,502.278,262.121,502.278,266.336z"/>
<path style="fill:#7ED63E;" d="M500.426,254.2c-0.156,0.52-0.333,1.03-0.52,1.551c-6.36,17.757-23.388,24.648-36.659,14.843
l-15.915-11.762c-11.106-8.202-25.272-4.84-33.308,7.911l-0.677,1.082c-7.713,12.261-21.161,15.904-32.142,8.722l-35.639-23.305
c-8.223-5.381-18.08-4.788-25.865,1.551l-28.561,23.232c-8.202,6.672-18.652,6.943-27.073,0.708l-32.579-24.148
c-8.327-6.172-18.652-5.964-26.823,0.52L175,278.67c-7.963,6.308-17.976,6.682-26.209,0.968l-38.408-26.688
c-7.557-5.256-16.664-5.402-24.325-0.385l-35.826,23.419c-23.857,3.081-35.462-14.447-35.462-14.447
c-1.343-2.342-2.404-4.788-3.195-7.286c3.674-11.803,12.574-20.901,24.148-20.901h440.566
C487.633,233.351,496.699,242.313,500.426,254.2z"/>
<path style="fill:#FF3501;" d="M493.389,211.93c0.073,3.466-0.385,6.807-1.28,9.961c-4.028,14.031-16.956,24.294-32.277,24.294
c-60.162,0-220.403-1.353-244.571-0.552c-0.541,0.021-1.082,0.042-1.613,0.052c-30.518,1.155-37.471,6.047-37.471,22.316v59.527
c0,3.06-1.239,5.839-3.247,7.848c-2.009,2.009-4.778,3.247-7.838,3.247c-6.131,0-11.096,4.965-11.096,11.096v25.928
c0,2.633-0.312,5.184-0.916,7.64c-3.424,14.177-16.217,24.7-31.58,24.7h-0.822c-17.466,0-31.601-14.187-31.549-31.653l0.146-46.932
c0.01-3.601,1.478-6.87,3.841-9.222c2.373-2.363,5.631-3.82,9.243-3.82c7.224,0,13.084-5.86,13.084-13.084v-35.275
c0-12.053-9.763-21.816-21.816-21.816H52.803c-18.371,0-33.828-14.499-34.203-32.87c-0.375-18.85,14.801-34.255,33.568-34.255
h406.998C477.547,179.06,493.025,193.559,493.389,211.93z"/>
<path style="fill:#FF5023;" d="M493.389,211.93c0.073,3.466-0.385,6.807-1.28,9.961c-63.69-0.062-215.875-1.322-239.377-0.552
c-31.892,1.051-39.084,5.829-39.084,22.379v1.967c-30.518,1.155-37.471,6.047-37.471,22.316v59.527c0,3.06-1.239,5.839-3.247,7.848
c-2.009,2.009-4.778,3.247-7.838,3.247c-6.131,0-11.096,4.965-11.096,11.096v25.928c0,2.633-0.312,5.184-0.916,7.64
c-15.051-2.425-26.532-15.509-26.48-31.247l0.146-46.922c0.01-3.612,1.478-6.87,3.841-9.222c2.373-2.363,5.631-3.82,9.243-3.82
c7.224,0,13.084-5.86,13.084-13.084v-35.275c0-12.053-9.763-21.816-21.816-21.816H90.274c-18.371,0-33.828-14.499-34.203-32.87
c-0.073-3.466,0.385-6.807,1.291-9.971h401.804C477.547,179.06,493.025,193.559,493.389,211.93z"/>
<path style="fill:#EEBF00;" d="M301.371,144.94l-74.266,74.297c-7.442,7.442-16.217,12.74-25.564,15.873
c-23.045,7.786-49.524,2.488-67.864-15.873L59.381,144.94H301.371z"/>
<path style="fill:#FFD422;" d="M301.371,144.94l-74.266,74.297c-7.442,7.442-16.217,12.74-25.564,15.873
c-9.337-3.133-18.111-8.431-25.543-15.873l-74.297-74.297H301.371z"/>
<path style="fill:#FFA733;" d="M512,155.391c0,0.552-0.021,1.093-0.052,1.634c-0.406,6.984-3.404,13.281-8.046,17.924
c-5.007,5.007-11.918,8.098-19.558,8.098H27.656C12.386,183.046,0,170.66,0,155.391C0,122.25,15.363,97.3,38.564,78.533
c18.829-15.238,42.831-26.407,67.958-34.598C176.822,21.047,256,21.473,256,21.473S512,20.089,512,155.391z"/>
<path style="fill:#FFB655;" d="M512,155.391c0,0.552-0.021,1.093-0.052,1.634H83.862c-15.269,0-27.656-12.386-27.656-27.656
c0-33.141,15.363-58.091,38.564-76.857c3.726-3.019,7.65-5.87,11.751-8.577C176.822,21.047,256,21.473,256,21.473
S512,20.089,512,155.391z"/>
<g>
<path style="fill:#FFF5CC;" d="M393.6,69.855c4.439,4.698,4.229,12.105-0.468,16.545c-4.698,4.439-12.105,4.229-16.544-0.468
c-4.439-4.697-12.61-20.974-7.912-25.414S389.161,65.156,393.6,69.855z"/>
<path style="fill:#FFF5CC;" d="M331.565,127.694c2.317,6.034-0.696,12.804-6.73,15.121c-6.034,2.317-12.804-0.696-15.121-6.73
c-2.317-6.034-3.678-24.195,2.355-26.512C318.103,107.257,329.248,121.66,331.565,127.694z"/>
<path style="fill:#FFF5CC;" d="M267.703,79.559c0,6.464-5.24,11.703-11.703,11.703c-6.464,0-11.703-5.24-11.703-11.703
c0-6.464,5.24-23.905,11.703-23.905C262.464,55.653,267.703,73.095,267.703,79.559z"/>
<path style="fill:#FFF5CC;" d="M203.354,135.028c-1.616,6.258-8,10.021-14.258,8.405c-6.258-1.616-10.021-8-8.405-14.258
c1.616-6.258,11.051-21.835,17.31-20.219C204.259,110.572,204.97,128.771,203.354,135.028z"/>
<path style="fill:#FFF5CC;" d="M138.969,84.05c-2.818,5.816-9.817,8.248-15.635,5.43c-5.816-2.818-8.248-9.817-5.43-15.635
c2.818-5.816,15.137-19.23,20.955-16.411C144.676,60.253,141.787,78.234,138.969,84.05z"/>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 7.0 KiB

View File

@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Capa_1" x="0px" y="0px" viewBox="0 0 505.501 505.501" style="enable-background:new 0 0 505.501 505.501;" xml:space="preserve" width="512" height="512">
<g>
<path style="fill:#A2DB18;" d="M470.802,163.55c-1.482-1.481-3.497-2.294-5.605-2.222l-12.513,0.384 c-1.963,0.06-3.825,0.878-5.198,2.282l-8.857,9.056l-12.673,0.32c-2.087,0.052-4.06,0.962-5.456,2.514l-8.48,9.428l-12.652,0.878 c-2.095,0.145-4.036,1.151-5.363,2.78l-8.033,9.857l-12.617,1.588c-2.11,0.266-4.012,1.404-5.244,3.137l-7.398,10.411 l-12.511,2.608c-2.137,0.446-3.979,1.789-5.057,3.689l-6.371,11.23l-12.186,4.326c-2.191,0.778-3.905,2.516-4.652,4.717 l-3.941,11.61l-10.74,5.878c-1.991,1.09-3.39,3.013-3.815,5.242l-2.269,11.908l-9.939,6.925c-1.817,1.266-2.991,3.262-3.215,5.465 l-1.219,11.993l-9.363,7.585c-1.7,1.377-2.724,3.42-2.809,5.606l-0.47,12.008l-8.907,8.058c-1.613,1.459-2.523,3.54-2.5,5.714 l0.129,12.004l-8.51,8.47c-1.465,1.459-2.273,3.451-2.237,5.518l0.212,12.037c0.072,4.091,3.371,7.39,7.462,7.462l12.025,0.212 c0.045,0,0.089,0.001,0.134,0.001c2.019,0,3.958-0.804,5.385-2.239l8.466-8.509l12.014,0.126c2.158,0.018,4.253-0.887,5.712-2.499 l8.063-8.91l12.01-0.471c2.185-0.086,4.228-1.109,5.605-2.808l7.589-9.366l11.993-1.219c2.203-0.224,4.199-1.398,5.465-3.215 l6.923-9.938l11.906-2.268c2.23-0.425,4.153-1.825,5.242-3.816l5.877-10.738l11.607-3.939c2.201-0.747,3.94-2.461,4.718-4.652 l4.327-12.188l11.231-6.372c1.899-1.077,3.242-2.919,3.688-5.056l2.61-12.515l10.413-7.401c1.734-1.232,2.871-3.134,3.137-5.243 l1.588-12.617l9.855-8.03c1.628-1.326,2.634-3.268,2.78-5.363l0.878-12.65l9.424-8.475c1.553-1.396,2.463-3.371,2.515-5.458 l0.318-12.665l9.056-8.859c1.403-1.372,2.221-3.235,2.281-5.198l0.384-12.521C473.088,167.06,472.284,165.031,470.802,163.55z"/>
<path style="fill:#A2DB18;" d="M264.193,376.4l-8.343-12.099l0.434-12.694c0.074-2.172-0.785-4.273-2.362-5.769l-8.707-8.266 l-0.158-12.003c-0.029-2.18-0.993-4.243-2.647-5.663l-9.125-7.837l-0.819-12.006c-0.149-2.194-1.242-4.215-2.995-5.541 l-9.631-7.286l-1.692-11.964c-0.314-2.215-1.587-4.179-3.481-5.369l-10.302-6.471l-2.994-11.804 c-0.57-2.248-2.136-4.113-4.251-5.063l-11.288-5.07l-5.479-11.694c-0.949-2.026-2.743-3.531-4.904-4.113l-12.397-3.338 l-6.957-10.774c-1.166-1.806-3.042-3.033-5.163-3.378l-12.577-2.044l-7.745-10.111c-1.284-1.676-3.207-2.742-5.308-2.942 l-12.643-1.209l-8.269-9.63c-1.364-1.588-3.322-2.543-5.412-2.64l-12.661-0.586l-8.679-9.244c-1.428-1.521-3.42-2.388-5.506-2.397 l-13.343-0.056l-12.542-8.908c-3.022-2.146-7.152-1.798-9.771,0.822c-2.62,2.621-2.968,6.75-0.821,9.771l8.912,12.546l0.057,13.345 c0.009,2.087,0.876,4.079,2.398,5.507l9.239,8.67l0.585,12.655c0.097,2.091,1.052,4.049,2.64,5.413l9.629,8.268l1.207,12.64 c0.2,2.102,1.267,4.025,2.942,5.308l10.112,7.746l2.045,12.58c0.345,2.121,1.572,3.997,3.377,5.163l10.777,6.96l3.339,12.4 c0.582,2.16,2.087,3.955,4.112,4.904l11.694,5.479l5.068,11.285c0.95,2.116,2.814,3.682,5.063,4.252l11.801,2.993l6.47,10.3 c1.189,1.895,3.154,3.168,5.369,3.482l11.962,1.692l7.286,9.63c1.326,1.753,3.347,2.846,5.54,2.996l12.011,0.821l7.839,9.126 c1.42,1.653,3.482,2.617,5.661,2.646l12.01,0.16l8.275,8.712c1.497,1.576,3.607,2.437,5.769,2.361l12.69-0.436l12.093,8.337 c1.307,0.901,2.812,1.342,4.309,1.342c1.96,0,3.905-0.756,5.375-2.225C265.904,383.491,266.275,379.418,264.193,376.4z"/>
<path style="fill:#6ABA0F;" d="M470.802,163.55c-1.482-1.481-3.497-2.294-5.605-2.222l-12.513,0.384 c-1.963,0.06-3.825,0.878-5.198,2.282l-4.855,4.963c0,0.066,0.006,0.131,0.004,0.198l-0.384,12.521 c-0.06,1.963-0.878,3.825-2.281,5.198l-9.056,8.859l-0.318,12.665c-0.052,2.088-0.962,4.062-2.515,5.458l-9.424,8.475l-0.878,12.65 c-0.145,2.095-1.151,4.037-2.78,5.363l-9.855,8.03l-1.588,12.617c-0.266,2.109-1.403,4.011-3.137,5.243l-10.413,7.401l-2.61,12.515 c-0.446,2.137-1.789,3.979-3.688,5.056l-11.231,6.372l-4.327,12.188c-0.778,2.191-2.516,3.905-4.718,4.652l-11.606,3.939 l-5.877,10.738c-1.09,1.991-3.013,3.391-5.242,3.816l-11.906,2.268l-6.923,9.938c-1.266,1.817-3.262,2.991-5.465,3.215 l-11.993,1.219l-7.589,9.366c-1.377,1.699-3.42,2.723-5.605,2.808l-12.01,0.471l-8.063,8.91c-1.459,1.612-3.554,2.516-5.712,2.499 l-12.014-0.126l-3.083,3.099c0.086,4.079,3.378,7.364,7.461,7.436l12.025,0.212c0.045,0,0.089,0.001,0.134,0.001 c2.019,0,3.958-0.804,5.385-2.239l8.466-8.509l12.014,0.126c2.158,0.018,4.253-0.887,5.712-2.499l8.063-8.91l12.01-0.471 c2.185-0.086,4.228-1.109,5.605-2.808l7.589-9.366l11.993-1.219c2.203-0.224,4.199-1.398,5.465-3.215l6.923-9.938l11.906-2.268 c2.23-0.425,4.153-1.825,5.242-3.816l5.877-10.738l11.607-3.939c2.201-0.747,3.94-2.461,4.718-4.652l4.327-12.188l11.231-6.372 c1.899-1.077,3.242-2.919,3.688-5.056l2.61-12.515l10.413-7.401c1.734-1.232,2.871-3.134,3.137-5.243l1.588-12.617l9.855-8.03 c1.628-1.326,2.634-3.268,2.78-5.363l0.878-12.65l9.424-8.475c1.553-1.396,2.463-3.371,2.515-5.458l0.318-12.665l9.056-8.859 c1.403-1.372,2.221-3.235,2.281-5.198l0.384-12.521C473.088,167.06,472.284,165.031,470.802,163.55z"/>
<path style="fill:#A2DB18;" d="M263.308,354.836c-2.816-2.816-7.329-2.979-10.34-0.374l-6.257,5.41l-6.502-1.556 c-3.175-0.758-6.481,0.594-8.211,3.362l-2.853,4.565l-5.292-1.004c-3.213-0.612-6.456,0.906-8.049,3.762l-2.639,4.728l-5.37-0.716 c-3.259-0.434-6.432,1.279-7.855,4.246l-2.367,4.937l-5.471-0.328c-3.321-0.2-6.392,1.789-7.565,4.906l-1.968,5.229l-5.593,0.27 c-3.414,0.164-6.297,2.588-7.046,5.922l-1.286,5.722l-5.985,1.473c-3.211,0.791-5.542,3.568-5.763,6.868l-0.409,6.078l-5.651,2.237 c-2.988,1.183-4.909,4.118-4.797,7.33l0.209,5.97l-5.355,2.636c-2.847,1.401-4.523,4.424-4.203,7.581l0.596,5.891l-5.154,2.905 c-2.748,1.549-4.253,4.633-3.782,7.752l0.88,5.829l-5.002,3.119c-2.671,1.666-4.038,4.806-3.437,7.897l1.364,7.011l-5.805,6.583 c-2.652,3.008-2.51,7.561,0.326,10.397c1.479,1.478,3.424,2.225,5.373,2.225c1.79,0,3.584-0.63,5.024-1.9l6.583-5.807l7.014,1.364 c3.088,0.598,6.232-0.768,7.897-3.44l3.112-4.995l5.821,0.88c3.121,0.473,6.206-1.034,7.754-3.782l2.903-5.152l5.886,0.597 c3.154,0.32,6.181-1.355,7.583-4.203l2.637-5.357l5.974,0.209c3.214,0.109,6.145-1.808,7.329-4.795l2.24-5.657l6.083-0.41 c3.299-0.222,6.076-2.553,6.866-5.763l1.474-5.986l5.721-1.286c3.335-0.749,5.758-3.633,5.922-7.047l0.269-5.589l5.225-1.966 c3.118-1.173,5.108-4.241,4.908-7.566l-0.328-5.469l4.936-2.366c2.967-1.421,4.681-4.592,4.248-7.853l-0.716-5.377l4.731-2.64 c2.855-1.594,4.371-4.836,3.762-8.048L251.904,389l4.573-2.862c2.767-1.731,4.118-5.035,3.359-8.209l-1.557-6.5l5.405-6.254 C266.288,362.163,266.124,357.651,263.308,354.836z"/>
<path style="fill:#A2DB18;" d="M391.025,478.043l-4.93-3.215l1.003-5.805c0.536-3.103-0.898-6.214-3.604-7.823l-5.073-3.016 l0.747-5.855c0.401-3.136-1.184-6.192-3.977-7.674l-5.249-2.783l0.421-5.928c0.227-3.182-1.559-6.166-4.471-7.471l-5.485-2.459 l-0.056-6.018c-0.03-3.25-2.124-6.121-5.21-7.142l-5.874-1.943l-0.899-6.14c-0.494-3.372-3.173-6.003-6.554-6.435l-5.654-0.723 l-1.68-5.432c-0.995-3.215-3.983-5.421-7.35-5.351l-5.529,0.067l-2.19-5.068c-1.312-3.036-4.438-4.874-7.726-4.546l-5.418,0.539 L303.754,373c-1.514-2.908-4.724-4.521-7.96-3.99l-5.33,0.868l-2.749-4.643c-1.665-2.81-4.937-4.241-8.132-3.557l-5.262,1.131 l-2.963-4.499c-1.826-2.772-5.241-4.04-8.43-3.127l-7.078,2.02c-2.525,0.721-4.498,2.694-5.219,5.218l-2.019,7.068 c-0.912,3.192,0.354,6.607,3.127,8.432l4.499,2.962l-1.13,5.272c-0.684,3.192,0.748,6.464,3.556,8.128l4.646,2.752l-0.868,5.331 c-0.527,3.235,1.081,6.443,3.987,7.958l4.829,2.515l-0.54,5.419c-0.328,3.291,1.511,6.416,4.547,7.727l5.066,2.188l-0.068,5.525 c-0.042,3.366,2.137,6.357,5.352,7.352l5.429,1.678l0.722,5.653c0.432,3.381,3.063,6.061,6.435,6.554l6.141,0.899l1.945,5.876 c1.021,3.084,3.89,5.178,7.139,5.209l6.024,0.058l2.462,5.49c1.305,2.911,4.286,4.698,7.47,4.469l5.928-0.421l2.78,5.245 c1.481,2.794,4.537,4.381,7.675,3.978l5.853-0.747l3.012,5.069c1.609,2.709,4.725,4.142,7.827,3.606l5.797-1.004l3.216,4.93 c1.422,2.179,3.832,3.446,6.361,3.446c0.546,0,1.096-0.059,1.645-0.181l7.402-1.64c2.883-0.639,5.135-2.89,5.773-5.773l1.639-7.398 C394.976,482.96,393.675,479.771,391.025,478.043z"/>
<path style="fill:#6ABA0F;" d="M391.025,478.043l-4.93-3.215l1.003-5.805c0.536-3.103-0.898-6.214-3.604-7.823l-5.073-3.016 l0.747-5.855c0.401-3.136-1.184-6.192-3.977-7.674l-5.249-2.783l0.421-5.928c0.227-3.182-1.559-6.166-4.471-7.471l-5.485-2.459 l-0.056-6.018c-0.03-3.25-2.124-6.121-5.21-7.142l-5.874-1.943l-0.899-6.14c-0.494-3.372-3.173-6.003-6.554-6.435l-5.654-0.723 l-1.68-5.432c-0.995-3.215-3.983-5.421-7.35-5.351l-5.529,0.067l-2.19-5.068c-1.312-3.036-4.438-4.874-7.726-4.546l-5.418,0.539 L303.754,373c-1.514-2.908-4.724-4.521-7.96-3.99l-5.33,0.868l-2.749-4.643c-1.665-2.81-4.937-4.241-8.132-3.557l-5.262,1.131 l-2.963-4.499c-1.826-2.772-5.241-4.04-8.43-3.127l-7.078,2.02c-2.22,0.634-4.012,2.237-4.903,4.33 c2.586,0.054,5.02,1.407,6.379,3.701l2.749,4.643l5.33-0.868c3.236-0.531,6.445,1.082,7.96,3.99l2.512,4.824l5.418-0.539 c3.289-0.327,6.415,1.51,7.726,4.546l2.19,5.068l5.529-0.067c3.367-0.07,6.355,2.137,7.35,5.351l1.68,5.432l5.654,0.723 c3.381,0.432,6.06,3.063,6.554,6.435l0.899,6.14l5.874,1.943c3.086,1.021,5.18,3.892,5.21,7.142l0.056,6.018l5.485,2.459 c2.911,1.305,4.697,4.289,4.471,7.471l-0.421,5.928l5.249,2.783c2.793,1.481,4.378,4.537,3.977,7.674l-0.747,5.855l5.073,3.016 c2.706,1.609,4.14,4.72,3.604,7.823l-1.003,5.805l4.93,3.215c2.65,1.728,3.951,4.918,3.266,8.006l-1.639,7.398 c-0.019,0.085-0.052,0.163-0.074,0.247c0.089-0.012,0.177-0.01,0.267-0.025l5.797-1.004l3.216,4.93 c1.422,2.179,3.832,3.446,6.361,3.446c0.546,0,1.096-0.059,1.645-0.181l7.402-1.64c2.883-0.639,5.135-2.89,5.773-5.773l1.639-7.398 C394.976,482.96,393.675,479.771,391.025,478.043z"/>
<path style="fill:#80C433;" d="M503.579,369.461l-6.7-7.528c-1.596-1.793-3.942-2.731-6.338-2.517l-9.538,0.835l-6.423-7.113 c-1.671-1.851-4.142-2.765-6.617-2.442l-9.508,1.235l-6.734-6.828c-1.76-1.784-4.289-2.583-6.753-2.143l-9.473,1.703l-7.132-6.465 c-1.877-1.701-4.477-2.356-6.937-1.743l-9.399,2.339l-7.682-5.913c-2.053-1.58-4.769-2.004-7.208-1.128l-9.255,3.333l-8.552-4.9 c-2.376-1.362-5.302-1.338-7.658,0.061l-7.971,4.738l-8.653-3.286c-2.515-0.955-5.347-0.508-7.446,1.173l-7.121,5.704l-8.821-2.3 c-2.547-0.664-5.259,0.038-7.164,1.857l-6.546,6.251l-8.892-1.646c-2.56-0.472-5.189,0.399-6.959,2.313l-6.118,6.616l-8.932-1.152 c-2.568-0.331-5.136,0.672-6.8,2.661l-5.772,6.902l-8.97-0.725c-2.522-0.207-4.971,0.857-6.547,2.83l-6.068,7.593 c-2.216,2.773-2.216,6.711-0.001,9.484l6.06,7.586c1.576,1.973,4.035,3.032,6.548,2.831l8.969-0.726l5.779,6.907 c1.664,1.989,4.227,2.993,6.798,2.66l8.937-1.151l6.12,6.617c1.769,1.914,4.396,2.787,6.958,2.312l8.899-1.645l6.546,6.251 c1.904,1.819,4.616,2.521,7.164,1.857l8.818-2.301l7.119,5.702c2.099,1.681,4.932,2.127,7.447,1.173l8.651-3.286l7.968,4.737 c1.195,0.711,2.539,1.067,3.882,1.067c1.303,0,2.606-0.335,3.777-1.005l8.553-4.9l9.259,3.333c2.438,0.879,5.154,0.452,7.206-1.128 l7.685-5.914l9.404,2.338c2.46,0.612,5.059-0.043,6.936-1.744l7.132-6.465l9.466,1.703c2.466,0.444,4.995-0.358,6.755-2.143 l6.732-6.827l9.504,1.236c2.476,0.323,4.948-0.592,6.619-2.444l6.415-7.109l9.539,0.835c2.392,0.215,4.741-0.725,6.338-2.517 l6.705-7.534C506.142,376.683,506.142,372.34,503.579,369.461z"/>
<g>
<path style="fill:#6ABA0F;" d="M357.496,413.941l-6.533,3.743c1.35,0.252,2.763,0.149,4.09-0.355l5.768-2.191L357.496,413.941z"/>
<path style="fill:#6ABA0F;" d="M357.495,335.085l3.323-1.197l-5.769-2.191c-1.326-0.503-2.738-0.607-4.086-0.356L357.495,335.085z "/>
<path style="fill:#6ABA0F;" d="M503.579,369.461l-6.7-7.528c-1.596-1.793-3.942-2.731-6.338-2.517l-9.538,0.835l-6.423-7.113 c-1.671-1.851-4.142-2.765-6.617-2.442l-9.508,1.235l-6.734-6.828c-1.76-1.784-4.289-2.583-6.753-2.143l-9.473,1.703l-7.132-6.465 c-1.877-1.701-4.477-2.356-6.937-1.743l-9.399,2.339l-7.682-5.913c-2.053-1.58-4.769-2.004-7.208-1.128l-9.255,3.333l-8.552-4.9 c-2.376-1.362-5.302-1.338-7.658,0.061l-1.83,1.088c1.473,0.101,2.909,0.618,4.115,1.546l7.682,5.913l9.399-2.339 c2.459-0.612,5.06,0.042,6.937,1.743l7.132,6.465l9.473-1.703c2.464-0.44,4.993,0.358,6.753,2.143l6.734,6.828l9.508-1.235 c2.474-0.322,4.945,0.592,6.617,2.442l6.423,7.113l9.538-0.835c2.396-0.214,4.742,0.724,6.338,2.517l6.7,7.528 c2.562,2.879,2.562,7.222,0,10.101l-6.705,7.534c-1.597,1.792-3.946,2.732-6.338,2.517l-9.539-0.835l-6.415,7.109 c-1.671,1.852-4.143,2.767-6.619,2.444l-9.504-1.236l-6.732,6.827c-1.76,1.785-4.29,2.586-6.755,2.143l-9.466-1.703l-7.132,6.465 c-1.876,1.701-4.476,2.356-6.936,1.744l-9.404-2.338l-7.685,5.914c-1.206,0.928-2.643,1.446-4.116,1.547l1.827,1.086 c1.195,0.711,2.539,1.067,3.882,1.067c1.303,0,2.606-0.335,3.777-1.005l8.553-4.9l9.259,3.333 c2.438,0.879,5.154,0.452,7.206-1.128l7.685-5.914l9.404,2.338c2.46,0.612,5.059-0.043,6.936-1.744l7.132-6.465l9.466,1.703 c2.466,0.444,4.995-0.358,6.755-2.143l6.732-6.827l9.504,1.236c2.476,0.323,4.948-0.592,6.619-2.444l6.415-7.109l9.539,0.835 c2.392,0.215,4.741-0.725,6.338-2.517l6.705-7.534C506.142,376.683,506.142,372.34,503.579,369.461z"/>
</g>
<path style="fill:#80C433;" d="M264.582,374.314c-0.756-3.679-4.082-6.25-7.84-6.058l-9.037,0.474l-5.622-7.054 c-1.616-2.027-4.158-3.094-6.731-2.821l-8.95,0.937l-5.936-6.763c-1.714-1.953-4.309-2.894-6.875-2.496l-8.916,1.384l-6.315-6.447 c-1.831-1.87-4.498-2.666-7.054-2.104l-8.865,1.945l-6.809-6.01c-1.992-1.758-4.758-2.347-7.293-1.555l-8.755,2.735l-7.501-5.3 c-2.238-1.581-5.154-1.833-7.63-0.663l-8.501,4.02l-8.959-4.041c-2.414-1.089-5.217-0.842-7.403,0.649l-8.062,5.498l-9.342-2.771 c-2.45-0.727-5.103-0.173-7.057,1.475l-7.38,6.222l-9.44-1.992c-2.463-0.519-5.023,0.214-6.837,1.96l-6.923,6.664l-9.491-1.456 c-2.467-0.377-4.969,0.481-6.681,2.301l-6.57,6.975l-9.53-1.031c-2.473-0.266-4.93,0.696-6.562,2.582l-6.837,7.9l-12.236,1.557 C2.843,371.513,0,374.742,0,378.567s2.844,7.053,6.639,7.536l12.242,1.556l6.839,7.901c1.633,1.886,4.089,2.851,6.563,2.581 l9.521-1.033l6.565,6.973c1.714,1.819,4.213,2.683,6.682,2.301l9.489-1.455l6.916,6.661c1.814,1.746,4.374,2.481,6.838,1.961 l9.442-1.992l7.384,6.224c1.954,1.647,4.607,2.202,7.056,1.475l9.345-2.77l8.066,5.499c2.187,1.491,4.992,1.737,7.403,0.648 l8.959-4.041l8.499,4.019c1.033,0.489,2.143,0.73,3.247,0.73c1.544,0,3.08-0.471,4.385-1.393l7.498-5.299l8.752,2.736 c2.535,0.792,5.301,0.203,7.293-1.555l6.808-6.008l8.863,1.945c2.555,0.562,5.222-0.233,7.053-2.103l6.323-6.451l8.918,1.384 c2.567,0.397,5.161-0.543,6.874-2.495l5.94-6.767l8.96,0.935c2.58,0.271,5.115-0.795,6.73-2.822l6.731-8.449l10.939-4.028 C263.29,381.674,265.337,377.994,264.582,374.314z"/>
<path style="fill:#80C433;" d="M318.583,193.964l-6.135-15.68l3.305-16.491c0.355-1.772,0.067-3.612-0.813-5.191l-8.128-14.585 l1.6-16.611c0.168-1.743-0.272-3.491-1.244-4.947l-9.237-13.833l0.503-16.62c0.052-1.725-0.484-3.416-1.521-4.796l-9.975-13.266 l-0.308-16.594c-0.032-1.713-0.642-3.366-1.731-4.688l-10.544-12.804l-1.002-16.556c-0.095-1.577-0.68-3.085-1.673-4.314 l-9.983-12.362c-1.442-1.786-3.615-2.824-5.91-2.824c-2.296,0-4.468,1.038-5.91,2.824l-9.981,12.36 c-0.993,1.229-1.577,2.737-1.673,4.314l-1.002,16.56l-10.547,12.809c-1.089,1.323-1.699,2.974-1.731,4.688l-0.309,16.596 l-9.975,13.269c-1.037,1.379-1.574,3.07-1.521,4.795l0.503,16.619l-9.236,13.832c-0.972,1.457-1.412,3.204-1.244,4.948 l1.601,16.608l-8.126,14.581c-0.88,1.579-1.168,3.419-0.813,5.191l3.305,16.488l-6.135,15.68c-0.708,1.808-0.696,3.819,0.033,5.619 l6.019,14.867l-3.354,15.667c-0.394,1.839-0.091,3.759,0.849,5.388l7.953,13.778l-1.637,15.815 c-0.188,1.817,0.284,3.641,1.331,5.137l9.083,12.983l-0.489,15.831c-0.055,1.799,0.53,3.56,1.651,4.967l9.849,12.366l0.376,15.804 c0.043,1.786,0.714,3.501,1.896,4.842l10.444,11.851l1.125,15.759c0.119,1.661,0.78,3.237,1.882,4.486l10.088,11.43 c1.442,1.634,3.516,2.57,5.696,2.57c2.179,0,4.253-0.936,5.696-2.57l10.084-11.424c1.102-1.248,1.763-2.825,1.882-4.486 l1.126-15.76l10.447-11.856c1.182-1.341,1.853-3.055,1.895-4.842l0.377-15.805l9.85-12.369c1.121-1.408,1.706-3.168,1.65-4.967 l-0.489-15.832l9.083-12.983c1.047-1.497,1.52-3.321,1.331-5.137l-1.638-15.814l7.952-13.776c0.94-1.629,1.243-3.549,0.849-5.389 l-3.354-15.664l6.018-14.866C319.279,197.783,319.291,195.772,318.583,193.964z"/>
<path style="fill:#6ABA0F;" d="M318.583,193.964l-6.135-15.68l3.305-16.491c0.355-1.772,0.067-3.612-0.813-5.191l-8.128-14.585 l1.6-16.611c0.168-1.743-0.272-3.491-1.244-4.947l-9.237-13.833l0.503-16.62c0.052-1.725-0.484-3.416-1.521-4.796l-9.975-13.266 l-0.308-16.594c-0.032-1.713-0.642-3.366-1.731-4.688l-10.544-12.804l-1.002-16.556c-0.095-1.577-0.68-3.085-1.673-4.314 l-9.983-12.362c-1.442-1.786-3.615-2.824-5.91-2.824c-2.296,0-4.468,1.038-5.91,2.824l-9.283,11.496l0.699,0.866 c0.993,1.229,1.577,2.737,1.673,4.314l1.002,16.556l10.544,12.804c1.089,1.323,1.699,2.975,1.731,4.688l0.308,16.594l9.975,13.266 c1.037,1.379,1.573,3.07,1.521,4.796l-0.503,16.62l9.237,13.833c0.972,1.457,1.412,3.204,1.244,4.947l-1.6,16.611l8.128,14.585 c0.88,1.579,1.168,3.419,0.813,5.191l-3.305,16.491l6.135,15.68c0.708,1.808,0.696,3.819-0.033,5.619l-6.018,14.866l3.354,15.664 c0.394,1.839,0.091,3.759-0.849,5.389l-7.952,13.776l1.638,15.814c0.188,1.817-0.284,3.641-1.331,5.137l-9.083,12.983l0.489,15.832 c0.055,1.799-0.53,3.559-1.65,4.967l-9.85,12.369l-0.377,15.805c-0.043,1.786-0.714,3.501-1.895,4.842l-10.447,11.856l-1.126,15.76 c-0.119,1.661-0.78,3.238-1.882,4.486l-0.585,0.663l9.498,10.761c1.442,1.634,3.516,2.57,5.696,2.57 c2.179,0,4.253-0.936,5.696-2.57l10.084-11.424c1.102-1.248,1.763-2.825,1.882-4.486l1.126-15.76l10.447-11.856 c1.182-1.341,1.853-3.055,1.895-4.842l0.377-15.805l9.85-12.369c1.121-1.408,1.706-3.168,1.65-4.967l-0.489-15.832l9.083-12.983 c1.047-1.497,1.52-3.321,1.331-5.137l-1.638-15.814l7.952-13.776c0.94-1.629,1.243-3.549,0.849-5.389l-3.354-15.664l6.018-14.866 C319.279,197.783,319.291,195.772,318.583,193.964z"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 18 KiB

View File

@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 512.001 512.001" style="enable-background:new 0 0 512.001 512.001;" xml:space="preserve">
<path style="fill:#8DFFFF;" d="M437.444,512H74.558c-9.402,0-17.024-7.622-17.024-17.024V17.024C57.534,7.622,65.156,0,74.558,0
h362.886c9.402,0,17.024,7.622,17.024,17.024v477.952C454.469,504.378,446.846,512,437.444,512z"/>
<path style="fill:#21D8DE;" d="M437.444,0h-42.498c9.402,0,17.024,7.622,17.024,17.024v477.952c0,9.402-7.622,17.024-17.024,17.024
h42.498c9.402,0,17.024-7.622,17.024-17.024V17.024C454.469,7.622,446.846,0,437.444,0z"/>
<rect x="57.531" y="32.893" style="fill:#45748C;" width="396.93" height="26.08"/>
<rect x="411.971" y="32.893" style="fill:#2D5872;" width="42.498" height="26.07"/>
<path style="fill:#E9FEFF;" d="M389.212,255.422c-44.155-8.2-45.661-0.095-89.816-8.295c-44.153-8.2-42.648-16.305-86.802-24.504
c-44.152-8.199-45.657-0.094-89.809-8.294c-35.416-6.577-41.46-13.093-65.251-19.646v300.294c0,9.402,7.622,17.024,17.024,17.024
h362.886c9.402,0,17.024-7.622,17.024-17.024V275.069C430.675,268.516,424.631,262,389.212,255.422z"/>
<g>
<path style="fill:#D0EFEF;" d="M411.97,494.976c0,9.402-7.622,17.024-17.024,17.024h42.498c9.402,0,17.024-7.622,17.024-17.024
V275.069c-17.514-4.824-25.423-9.628-42.498-14.451V494.976z"/>
<circle style="fill:#D0EFEF;" cx="128.931" cy="361.78" r="7.807"/>
<circle style="fill:#D0EFEF;" cx="313.771" cy="291.06" r="7.807"/>
<circle style="fill:#D0EFEF;" cx="221.311" cy="361.78" r="7.807"/>
<circle style="fill:#D0EFEF;" cx="387.461" cy="342.83" r="7.806"/>
<circle style="fill:#D0EFEF;" cx="295.042" cy="453.56" r="7.806"/>
<circle style="fill:#D0EFEF;" cx="395.271" cy="443.33" r="7.807"/>
<circle style="fill:#D0EFEF;" cx="97.701" cy="469.17" r="7.806"/>
<circle style="fill:#D0EFEF;" cx="121.121" cy="263.89" r="7.806"/>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.2 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 47 KiB

View File

@@ -0,0 +1,486 @@
$(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 fish = {
name: "Fisch",
weight: 1,
currentWeight: 1,
dropweight: function () {
var randomweight = Math.floor((Math.random() * 10) + 1);
this.weight = randomweight;
this.currentWeight = randomweight;
},
def: 15,
rarity: 'common',
statSlots: [],
runes: [],
amount: 1,
usable: 'false',
selected: 'false',
stackable: 'false',
object: 'true',
itemId: 1,
img: 'package://assets/img/items/fish.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 allItems = [fish, hamburger, cocaine, cannabis];
////////////////////////
// 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();
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].addEventListener("click", function () {
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) {
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) {
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;
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 + "/25 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
var elembenutzen = document.getElementById("buttonbenutzen");
elembenutzen.addEventListener('click', benutzen);
var elemwegwerfen = document.getElementById("buttonwegwerfen");
elemwegwerfen.addEventListener('click', wegwerfen);
var elemsubmit = document.getElementById("tf_submit");
elemsubmit.addEventListener('click', handeln);
function benutzen() {
if (currentSelected) {
if (playerInventory[currentSelected].usable == 'true') {
if (playerInventory[currentSelected].stackable == 'true') {
playerInventory[currentSelected].amount -= 1;
if (playerInventory[currentSelected].amount <= 0) {
playerInventory[currentSelected] = EmptySlot;
} else {
if (getItemSlotData[currentSelected].classList.contains('selected')) {
getItemSlotData[currentSelected].classList.remove('selected');
playerInventory[currentSelected].selected = 'false';
currentSelected = undefined;
}
}
drawToPage();
drawToHandel();
moveItemsInv();
getCommands();
} else {
playerInventory[currentSelected] = EmptySlot;
currentSelected = undefined;
drawToPage();
drawToHandel();
moveItemsInv();
}
mp.trigger("CEF:UseItemInv", playerInventory[currentSelected].itemId);
}
}
}
function wegwerfen() {
if (currentSelected) {
playerInventory[currentSelected] = EmptySlot;
currentSelected = undefined;
drawToPage();
drawToHandel();
moveItemsInv();
mp.events.callRemote('invThrowItem', playerInventory[currentSelected].itemId);
}
}
$(".phanWrapper").hide();
var trade = 1;
$("#buttonhandeln").click(function () {
if (trade == 1) {
$(".phanWrapper").show();
drawToHandel();
drawToPage();
moveItemsInv();
trade = 0;
} else {
$(".phanWrapper").hide();
trade = 1;
}
});
function handeln() {
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);
}
}
}
}
}

View File

@@ -82,8 +82,7 @@ Infobox(globalData);
import playerList from './Gui/playerlist'; import playerList from './Gui/playerlist';
playerList(); playerList();
import inventory from './Gui/Inventory/inventory';
inventory(globalData);
import vehicleMenu from './Gui/vehiclemenu/main'; import vehicleMenu from './Gui/vehiclemenu/main';
vehicleMenu(globalData); vehicleMenu(globalData);
@@ -106,6 +105,9 @@ playerInteraction(globalData);
import interactionMenu from './Interaction/interactionmenu'; import interactionMenu from './Interaction/interactionmenu';
interactionMenu(globalData); interactionMenu(globalData);
import inventory from './inventory/inventory';
inventory(globalData);
import Login from './Login/main'; import Login from './Login/main';
Login(globalData); Login(globalData);

View File

@@ -0,0 +1,78 @@

export default function inventory(globalData: GlobalData): void {
var invBrowser: BrowserMp = null;
var itemIdArr;
var itemAmountArr;
var money;
mp.events.add("openTradeWindow", (money1, itemIdArr1, itemAmountArr1) => {
if (!globalData.InMenu) {
if (invBrowser !== null) {
invBrowser.destroy()
invBrowser = null;
mp.gui.cursor.show(false, false);
return;
}
mp.gui.cursor.show(true, true);
invBrowser = mp.browsers.new("package://assets/html/inventory/handel/handelakzeptieren.html");
itemIdArr = itemIdArr1;
itemAmountArr = itemAmountArr1;
money = money1;
}
});
mp.events.add('inventoryShow', (itemIdArr1, itemAmountArr1) => {
if (!globalData.InMenu) {
if (invBrowser !== null) {
invBrowser.destroy()
invBrowser = null;
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.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:acceptTrade", () => {
mp.events.callRemote('acceptTrade');
invBrowser.destroy()
invBrowser = null;
mp.gui.cursor.show(false, false);
});
mp.events.add("CEF:declineTrade", () => {
mp.events.callRemote('declineTrade');
invBrowser.destroy()
invBrowser = null;
mp.gui.cursor.show(false, false);
});
mp.events.add("CEF:UseItemInv", (itemId) => {
mp.events.callRemote('invUseItem', itemId);
});
mp.events.add("CEF:tradeItem", (money, User, tradeItems, tradeItemAmount) => {
mp.events.callRemote('tradeItem', money, User, tradeItems, tradeItemAmount);
invBrowser.destroy()
invBrowser = null;
mp.gui.cursor.show(false, false);
});
}

View File

@@ -287,7 +287,7 @@ namespace ReallifeGamemode.Server.Events
public void KeyPressI(Client player) public void KeyPressI(Client player)
{ {
if (!player.IsLoggedIn()) return; if (!player.IsLoggedIn()) return;
InventoryManager.GetUserItems(player); ManagerOfInventory.GetUserItems(player);
} }
[RemoteEvent("keyPress:O")] [RemoteEvent("keyPress:O")]
@@ -368,12 +368,19 @@ namespace ReallifeGamemode.Server.Events
public void KeyPressN(Client player) public void KeyPressN(Client player)
{ {
if (!player.IsLoggedIn()) return; if (!player.IsLoggedIn()) return;
} }
[RemoteEvent("keyPress:X")] [RemoteEvent("keyPress:X")]
public void KeyPressX(Client player) public void KeyPressX(Client player)
{ {
if (!player.IsLoggedIn()) return; if (!player.IsLoggedIn()) return;
if (player.HasData("inTrade") && player.GetData("inTrade") == true)
{
ManagerOfInventory.OpenTradeAccept(player);
}
if (player.IsInVehicle && player.VehicleSeat == -1) if (player.IsInVehicle && player.VehicleSeat == -1)
{ {
ServerVehicle veh = player.Vehicle.GetServerVehicle(); ServerVehicle veh = player.Vehicle.GetServerVehicle();

View File

@@ -14,9 +14,9 @@ namespace ReallifeGamemode.Server.Inventory.Items
public class Cheeseburger : FoodItem public class Cheeseburger : FoodItem
{ {
public override int Id => 2; public override int Id => 2;
public override string Name => "Cheeseburger"; public override string Name => "Hamburger";
public override string Description => "Wie der Hamburger, nur mit Käse."; public override string Description => "Ein Burger";
public override int Gewicht => 320; public override int Gewicht => 300;
public override string Einheit => "g"; public override string Einheit => "g";
public override int HpAmount => 20; public override int HpAmount => 20;
public override uint Object => 2240524752; public override uint Object => 2240524752;