From 662e791c76fa047dd133fdece25bbe73ad17470b Mon Sep 17 00:00:00 2001
From: MasterGordon <gologo.x@gmail.com>
Date: Mon, 2 Apr 2018 13:00:53 +0200
Subject: [PATCH] Added Selling + Big Inventory Tooltips

---
 css/main.css                 |   2 +-
 images/tiles/warehouse10.png | Bin 0 -> 477 bytes
 js/game.js                   |  40 ++++++++++++++++++++++++++++++++-
 js/userinterface.js          |  42 ++++++++++-------------------------
 lang/en.json                 |   2 +-
 5 files changed, 53 insertions(+), 33 deletions(-)
 create mode 100644 images/tiles/warehouse10.png

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 0000000000000000000000000000000000000000..5c04e3ba081c73aead432aa71eeeedaba66ff90c
GIT binary patch
literal 477
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!pk#?_L`iUdT1k0gQ7S`0VrE{6US4X6f{C7i
zo{`~4h0LiyQ++*M978gk-%bczcgTQ;#WJe@+U)k}{jTTsnXXD&E+MicFxtFLQf}?m
z_0R4<usI(l`At^tij(V_&kFT2?J+A@WZD@@7bv|^W401io-$ebLZ?g0f5v;?_wsf$
z$e-a$ENeLK&!TbVCdW%guUUcBo0qU@1ZtmoZ{)$9V7c#;rFHiNAqGwDw%<OHu2~G{
z-;|0zWKiwjxp!R>`yU^M?z&Wl=I?tZds-|w{75d#+{=q$@e|#w^l7S$vK_ZpAD!1*
z5Zy30-R+KCLuA+ycP4}TjP-9A`eh3y7Br|g&HV0nHvI<UJf5_B)~53nWiA9dRfHAK
zbM@fekhCK`(oS4ebpi86?G=9`FELqpO$)3R3}V)q5UZGblTl8U$*9go`@nBG^MtSV
z=FLTu7)75l?%vBJ5Ev<UK=9uB20r<9U8QnNR#^*$-dNk*;i$hdlY7f?;Twwn@gcsp
Rz^Gtg@O1TaS?83{1OSXcuV4TG

literal 0
HcmV?d00001

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('<canvas class="itemBig" id="itemBig_' + i + '"></canvas>')
+    $('#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<items.length;i++){
+      $('#itemBig_' + i)[0].getContext("2d").clearRect(0, 0, 72, 72)
+  }
   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 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!!"],