diff --git a/css/main.css b/css/main.css index 202afc5..06eae81 100644 --- a/css/main.css +++ b/css/main.css @@ -87,7 +87,7 @@ body { .itemBig { width: 72; height: 72; - background-image: url(../images/inventorybg.png); + /*background-image: url(../images/inventorybg.png);*/ } #showmore { diff --git a/images/tiles/warehouse10.png b/images/tiles/warehouse10.png new file mode 100644 index 0000000..5c04e3b Binary files /dev/null and b/images/tiles/warehouse10.png differ diff --git a/js/game.js b/js/game.js index dd7d618..6258443 100644 --- a/js/game.js +++ b/js/game.js @@ -165,7 +165,7 @@ function render() { drawInventory(inventory, lang["player"]) } $('#money').text(money + " " + lang.items[0]) - if(mode == "showmore"){ + if (mode == "showmore") { drawBigInventory(inventory) } } @@ -212,6 +212,44 @@ function prepairRender() { $('#buildselect').hide() $('#inventoryBig').hide() buildEvents() + //Build Sell/Select Items Menu + for (var i = 0; i < items.length; i++) { + $('#itemsScroll').append('') + $('#itemBig_' + i)[0].width = 72 + $('#itemBig_' + i)[0].height = 72 + } + $('canvas').hover( + function() { + //ENTER + var id = $(this).attr("id"); + if (id.startsWith("itemBig_")) { + id = parseInt(id.substr(8)) + if (id < itemId.length) { + hoverTooltip = true + $('#tooltip').text(lang.items[itemId[id]] + " (" + formatCount(items[itemId[id]].value) + " " + lang.items[0] + ")") + $('#tooltip').show() + tooltip = true + } + } + }, + function() { + //LEAVE + hoverTooltip = false + } + ); + $('canvas').click( + function() { + //ENTER + var id = $(this).attr("id"); + if (id.startsWith("itemBig_")) { + id = parseInt(id.substr(8)) + if (id < itemId.length) { + if(inventory.take(itemId[id],1)){ + money += items[itemId[id]].value + } + } + } + }) $('#clickToSell').text(lang.clickToSell) } diff --git a/js/userinterface.js b/js/userinterface.js index f635512..0258661 100644 --- a/js/userinterface.js +++ b/js/userinterface.js @@ -227,6 +227,9 @@ function setTooltip() { tooltip = false } +var itemId = [] +var itemCount = [] + function buildEvents() { $('img').click(function() { var id = $(this).attr("id"); @@ -371,8 +374,6 @@ function closeUi() { } } -var itemId = [] -var itemCount = [] function drawInventory(inventory, title) { if (!(inventory instanceof Inventory)) @@ -425,6 +426,9 @@ function drawInventory(inventory, title) { } } +var itembg = new Image +itembg.src = "images/inventorybg.png" + function drawBigInventory(inventory) { if (!(inventory instanceof Inventory)) return false; @@ -441,25 +445,17 @@ function drawBigInventory(inventory) { 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" + for(var i=0;i') - $('#itemBig_' + itemId[currentIndex])[0].width = 72; - $('#itemBig_' + itemId[currentIndex])[0].height = 72 - var itemCtx = $('#itemBig_' + itemId[currentIndex])[0].getContext("2d") + var itemCtx = $('#itemBig_' + currentIndex)[0].getContext("2d") var img = new Image img.src = "images/items/" + items[itemId[currentIndex]].name + ".png" + itemCtx.clearRect(0, 0, innerWidth, innerHeight) itemCtx.font = "16px Electrolize" + itemCtx.drawImage(itembg, 0, 0, 72, 72) itemCtx.drawImage(img, 12, 12, 48, 48) var formattedCount = formatCount(itemCount[currentIndex]) @@ -470,19 +466,5 @@ function drawBigInventory(inventory) { 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 - } - ); } } diff --git a/lang/en.json b/lang/en.json index a3aadf0..a21bf3c 100644 --- a/lang/en.json +++ b/lang/en.json @@ -18,7 +18,7 @@ } }, "items": ["Dollars", "Log", "Planks"], - "more": "Sell Items", + "more": "Show Inventory / Sell Items", "inventory": "Inventory", "player": "Player", "infotooltips": ["Build", "Move", "Rotate", "Delete!", "", "Upgrade", "Information", "", "Go To Space!!"],