diff --git a/game.js b/game.js index c2e2592..0d1a1b7 100644 --- a/game.js +++ b/game.js @@ -43,23 +43,23 @@ var WRITERLEFT = {type:"WRITER",direction:LEFT,color:RED} var WRITERRIGHT = {type:"WRITER",direction:RIGHT,color:RED} var WRITERUP = {type:"WRITER",direction:UP,color:RED} -var DEF_BRANCHUP_RB = {img:IMAGE_BRANCH,color1:RED,color2:BLUE} -var DEF_BRANCHUP_BR = {img:IMAGE_BRANCH,color1:BLUE,color2:RED} -var DEF_BRANCHUP_GY = {img:IMAGE_BRANCH,color1:GREEN,color2:YELLOW} -var DEF_BRANCHUP_YG = {img:IMAGE_BRANCH,color1:YELLOW,color2:GREEN} -var DEF_BRANCHUP_PPI = {img:IMAGE_BRANCH,color1:PURPLE,color2:PINK} -var DEF_BRANCHUP_PIP = {img:IMAGE_BRANCH,color1:PINK,color2:PURPLE} -var DEF_BRANCHUP_BLGR = {img:IMAGE_BRANCH,color1:BLACK,color2:GRAY} -var DEF_BRANCHUP_GRBL = {img:IMAGE_BRANCH,color1:GRAY,color2:BLACK} -var DEF_WRITERRIGHT_R = {img:IMAGE_WRITER,color1:RED} -var DEF_WRITERRIGHT_B = {img:IMAGE_WRITER,color1:BLUE} -var DEF_WRITERRIGHT_G = {img:IMAGE_WRITER,color1:GREEN} -var DEF_WRITERRIGHT_Y = {img:IMAGE_WRITER,color1:YELLOW} -var DEF_WRITERRIGHT_P = {img:IMAGE_WRITER,color1:PURPLE} -var DEF_WRITERRIGHT_PI = {img:IMAGE_WRITER,color1:PINK} -var DEF_WRITERRIGHT_BL = {img:IMAGE_WRITER,color1:BLACK} -var DEF_WRITERRIGHT_GR = {img:IMAGE_WRITER,color1:GRAY} -var DEF_CONVEYOR = {img:IMAGE_CONVEYOR} +var DEF_BRANCHUP_RB = {img:IMAGE_BRANCH,color1:RED,color2:BLUE,type:"BRANCH"} +var DEF_BRANCHUP_BR = {img:IMAGE_BRANCH,color1:BLUE,color2:RED,type:"BRANCH"} +var DEF_BRANCHUP_GY = {img:IMAGE_BRANCH,color1:GREEN,color2:YELLOW,type:"BRANCH"} +var DEF_BRANCHUP_YG = {img:IMAGE_BRANCH,color1:YELLOW,color2:GREEN,type:"BRANCH"} +var DEF_BRANCHUP_PPI = {img:IMAGE_BRANCH,color1:PURPLE,color2:PINK,type:"BRANCH"} +var DEF_BRANCHUP_PIP = {img:IMAGE_BRANCH,color1:PINK,color2:PURPLE,type:"BRANCH"} +var DEF_BRANCHUP_BLGR = {img:IMAGE_BRANCH,color1:BLACK,color2:GRAY,type:"BRANCH"} +var DEF_BRANCHUP_GRBL = {img:IMAGE_BRANCH,color1:GRAY,color2:BLACK,type:"BRANCH"} +var DEF_WRITERRIGHT_R = {img:IMAGE_WRITER,color1:RED,type:"WRITER"} +var DEF_WRITERRIGHT_B = {img:IMAGE_WRITER,color1:BLUE,type:"WRITER"} +var DEF_WRITERRIGHT_G = {img:IMAGE_WRITER,color1:GREEN,type:"WRITER"} +var DEF_WRITERRIGHT_Y = {img:IMAGE_WRITER,color1:YELLOW,type:"WRITER"} +var DEF_WRITERRIGHT_P = {img:IMAGE_WRITER,color1:PURPLE,type:"WRITER"} +var DEF_WRITERRIGHT_PI = {img:IMAGE_WRITER,color1:PINK,type:"WRITER"} +var DEF_WRITERRIGHT_BL = {img:IMAGE_WRITER,color1:BLACK,type:"WRITER"} +var DEF_WRITERRIGHT_GR = {img:IMAGE_WRITER,color1:GRAY,type:"WRITER"} +var DEF_CONVEYOR = {img:IMAGE_CONVEYOR,type:"BELT"} var GRID_W = 32 @@ -70,6 +70,8 @@ var GRID_Y = 20 var LAST_MOUSE_X=0; var LAST_MOUSE_Y=0; +var ITEM_DIRECTION=RIGHT; + var SUBMENU = { visible:false, width:0, @@ -332,10 +334,10 @@ function setupGame() { } function mouseOverButton(canvas,e,button) { - return (getMousePos(canvas,e).x>=button.x && - getMousePos(canvas,e).x<=button.x+button.w && - getMousePos(canvas,e).y>=button.y && - getMousePos(canvas,e).y<=button.y+button.h) + return (getMousePos(e).x>=button.x && + getMousePos(e).x<=button.x+button.w && + getMousePos(e).y>=button.y && + getMousePos(e).y<=button.y+button.h) } function clickEvent(e) { @@ -356,10 +358,31 @@ function clickEvent(e) { } } ITEM_SELECTED=button.lastselected - console.log(button) + //console.log(button) + return } } } + + //console.log(getGridCoords(getMousePos(e))) + if (ITEM_SELECTED!==undefined) { + var clickCoords = getGridCoords(getMousePos(e)) + if (clickCoords.x>=0&&clickCoords.y>=0&&clickCoords.y