Added Sell Menu

This commit is contained in:
MasterGordon 2018-03-31 14:41:11 +02:00
parent 729b5a3f81
commit 64e23f0887
10 changed files with 159 additions and 14 deletions

View File

@ -69,6 +69,7 @@ body {
border: 2px; border: 2px;
border-style: solid; border-style: solid;
border-color: gray; border-color: gray;
z-index: 100;
} }
#money { #money {
@ -80,16 +81,61 @@ body {
line-height: 42px; line-height: 42px;
text-align: center; text-align: center;
background-image: url(../images/moneybg.png); background-image: url(../images/moneybg.png);
z-index: -1;
}
.itemBig {
width: 72;
height: 72;
background-image: url(../images/inventorybg.png);
}
#showmore {
width: 200;
height: 24;
position: fixed;
}
#inventoryBig {
position: fixed;
border: 1px, solid, black;
border: solid;
border-color: yellow;
background-image: url("../images/wool.jpg");
width: 1192;
height: 568;
padding: 4;
}
#clickToSell {
width: 1192;
height: 38;
font-family: 'Electrolize', sans-serif;
font-size: 22px;
line-height: 38px;
text-align: center;
color: floralwhite;
}
#itemsScroll {
overflow-y: scroll;
width: 1192;
height: 530;
} }
body { body {
-webkit-touch-callout: none; /* iOS Safari */ -webkit-touch-callout: none;
-webkit-user-select: none; /* Safari */ /* iOS Safari */
-khtml-user-select: none; /* Konqueror HTML */ -webkit-user-select: none;
-moz-user-select: none; /* Firefox */ /* Safari */
-ms-user-select: none; /* Internet Explorer/Edge */ -khtml-user-select: none;
user-select: none; /* Non-prefixed version, currently /* Konqueror HTML */
supported by Chrome and Opera */ -moz-user-select: none;
/* Firefox */
-ms-user-select: none;
/* Internet Explorer/Edge */
user-select: none;
/* Non-prefixed version, currently supported by Chrome and Opera */
} }
.buildtile { .buildtile {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 439 B

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
images/unknown.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.8 KiB

View File

@ -30,10 +30,17 @@
</div> </div>
<div id="buildselect"> <div id="buildselect">
</div> </div>
<div id="inventoryBig">
<span id="clickToSell"></span>
<div id="itemsScroll">
</div>
</div>
<div id="tooltip"> <div id="tooltip">
<span> <span>
</span> </span>
</div> </div>
<div id="showmore">
</div>
<span id="money"> <span id="money">
??? Dollar ??? Dollar
</span> </span>

View File

@ -165,6 +165,9 @@ function render() {
drawInventory(inventory, lang["player"]) drawInventory(inventory, lang["player"])
} }
$('#money').text(money + " " + lang.items[0]) $('#money').text(money + " " + lang.items[0])
if(mode == "showmore"){
drawBigInventory(inventory)
}
} }
function getItemFormId(id) { function getItemFormId(id) {
@ -207,7 +210,9 @@ function prepairRender() {
} }
console.log(tilesLoaded + "/" + tileClasses.length + " Tiles Loaded!") console.log(tilesLoaded + "/" + tileClasses.length + " Tiles Loaded!")
$('#buildselect').hide() $('#buildselect').hide()
$('#inventoryBig').hide()
buildEvents() buildEvents()
$('#clickToSell').text(lang.clickToSell)
} }
var infoBarIcons = ["build.png", "move.png", "rotate.png", "delete.png", null, "upgrade.png", "info.png", null, "rocket.png"] var infoBarIcons = ["build.png", "move.png", "rotate.png", "delete.png", null, "upgrade.png", "info.png", null, "rocket.png"]

View File

@ -1,12 +1,15 @@
{ {
"items": [{ "items": [{
"id": 0, "id": 0,
"name": "money" "name": "money",
"value": 1
},{ },{
"id": 1, "id": 1,
"name": "log" "name": "log",
"value": 1
},{ },{
"id": 2, "id": 2,
"name": "planks" "name": "planks",
"value": 6
}] }]
} }

View File

@ -21,12 +21,16 @@ function style() {
$('#screen').css('margin-left', screenMarginLeft) $('#screen').css('margin-left', screenMarginLeft)
$('#buildselect').css('margin-top', screenMarginTop) $('#buildselect').css('margin-top', screenMarginTop)
$('#buildselect').css('margin-left', screenMarginLeft) $('#buildselect').css('margin-left', screenMarginLeft)
$('#inventoryBig').css('margin-top', screenMarginTop)
$('#inventoryBig').css('margin-left', screenMarginLeft)
$('#info').css('margin-top', itemCountMarginTop) $('#info').css('margin-top', itemCountMarginTop)
$('#info').css('margin-left', infoMarginLeft) $('#info').css('margin-left', infoMarginLeft)
$('#infoDesc').css('margin-top', itemCountMarginTop + 51) $('#infoDesc').css('margin-top', itemCountMarginTop + 51)
$('#infoDesc').css('margin-left', infoMarginLeft + 5) $('#infoDesc').css('margin-left', infoMarginLeft + 5)
$('#itemcount').css('margin-top', itemCountMarginTop) $('#itemcount').css('margin-top', itemCountMarginTop)
$('#itemcount').css('margin-left', screenMarginLeft) $('#itemcount').css('margin-left', screenMarginLeft)
$('#showmore').css('margin-top', itemCountMarginTop)
$('#showmore').css('margin-left', screenMarginLeft + 520)
$('#money').css('margin-top', itemCountMarginTop - 42) $('#money').css('margin-top', itemCountMarginTop - 42)
$('#money').css('margin-left', screenMarginLeft + 3) $('#money').css('margin-left', screenMarginLeft + 3)
screenleftpos = screenMarginLeft screenleftpos = screenMarginLeft
@ -137,6 +141,14 @@ function onDocumentMouseMove(event) {
} }
function clickEvents() { function clickEvents() {
$('#showmore').click(function() {
if (mode == "none") {
$('#inventoryBig').fadeIn(200)
mode = "showmore"
} else {
closeUi()
}
})
$('#info').click(function() { $('#info').click(function() {
if (cursorInfoY == 0) { if (cursorInfoY == 0) {
switch (cursorInfoX) { switch (cursorInfoX) {
@ -186,7 +198,11 @@ var moveFromCY = -1
//itemId[] //itemId[]
var hoverTooltip = false
function setTooltip() { function setTooltip() {
if (hoverTooltip)
return
if (cursorInfoY == 0) { if (cursorInfoY == 0) {
if (lang.infotooltips[cursorInfoX] == "") { if (lang.infotooltips[cursorInfoX] == "") {
$('#tooltip').hide() $('#tooltip').hide()
@ -286,7 +302,6 @@ function buildEvents() {
} }
); );
$('body').mousedown(function(e) { $('body').mousedown(function(e) {
if (e.which == 1) if (e.which == 1)
mousedown = true mousedown = true
@ -349,6 +364,11 @@ function closeUi() {
mode = "none" mode = "none"
return false return false
} }
if (mode == "showmore") {
mode = "none"
$('#inventoryBig').fadeOut(200)
return false
}
} }
var itemId = [] var itemId = []
@ -404,3 +424,65 @@ function drawInventory(inventory, title) {
} }
} }
} }
function drawBigInventory(inventory) {
if (!(inventory instanceof Inventory))
return false;
itemId = []
itemCount = []
for (let item of inventory.items) {
var id = item.id
var index = itemId.indexOf(item.id)
if (index == -1) {
itemId.push(id)
itemCount.push(1)
} else {
itemCount[index]++
}
}
//inventoryCtx.clearRect(0, 0, innerWidth, innerHeight)
//inventoryCtx.font = "20px Electrolize"
//inventoryCtx.fillStyle = "#a3a3a3"
//inventoryCtx.fillRect(0, 0, 25 * 48, 24);
//inventoryCtx.fillStyle = "black"
//inventoryCtx.fillText(lang.inventory + " - " + title, 2, 18)
//inventoryCtx.fillStyle = "black"
//inventoryCtx.textAlign = "start"
var currentIndex = 0
$('#itemsScroll').empty()
while (currentIndex != itemId.length) {
$('#itemsScroll').append('<canvas class="itemBig" style="width: 72; height: 72" id="itemBig_' + itemId[currentIndex] + '"></canvas>')
$('#itemBig_' + itemId[currentIndex])[0].width = 72;
$('#itemBig_' + itemId[currentIndex])[0].height = 72
var itemCtx = $('#itemBig_' + itemId[currentIndex])[0].getContext("2d")
var img = new Image
img.src = "images/items/" + items[itemId[currentIndex]].name + ".png"
itemCtx.font = "16px Electrolize"
itemCtx.drawImage(img, 12, 12, 48, 48)
var formattedCount = formatCount(itemCount[currentIndex])
itemCtx.strokeStyle = "black"
itemCtx.lineWidth = 2
itemCtx.strokeText("x" + formattedCount, 4, 67)
itemCtx.fillStyle = "white"
itemCtx.fillText("x" + formattedCount, 4, 67)
currentIndex++
$('#itemBig_' + itemId[currentIndex]).hover(
function() {
//ENTER
console.log("TRIGGER")
hoverTooltip = true
$('#tooltip').text(lang.items[itemId[currentIndex]] + "(" + formatCount(items[itemId[currentIndex]].value) + " " + lang.items[0] + ")")
$('#tooltip').show()
tooltip = true
},
function() {
//LEAVE
hoverTooltip = false
}
);
}
}

View File

@ -18,9 +18,10 @@
} }
}, },
"items": ["Dollars", "Log", "Planks"], "items": ["Dollars", "Log", "Planks"],
"more": "show more...", "more": "Sell Items",
"inventory": "Inventory", "inventory": "Inventory",
"player": "Player", "player": "Player",
"infotooltips": ["Build", "Move", "Rotate", "Delete!", "Upgrade", "Information", "Go To Space!!", "", ""], "infotooltips": ["Build", "Move", "Rotate", "Delete!", "", "Upgrade", "Information", "", "Go To Space!!"],
"cost": "Cost" "cost": "Cost",
"clickToSell": "Click on items to sell them."
} }

View File

@ -3,5 +3,6 @@ selectbuilding
building building
rotate rotate
delete delete
showmore
400 Items = 0.5 MB 400 Items = 0.5 MB