diff --git a/objects/circle.lua b/objects/circle.lua index 20911b3..25304cf 100644 --- a/objects/circle.lua +++ b/objects/circle.lua @@ -58,7 +58,7 @@ function gen:new(game,x,y,color,grid) end function Circle:MouseCallback(x,y,presses) - if self.rect:collidepoint(x,y) then + if not self.grid.tut.showing and self.rect:collidepoint(x,y) then if self:isMyTurn() then local c = self.game:findName("Circle") local i diff --git a/objects/grid.lua b/objects/grid.lua index e9792a7..c6601bb 100644 --- a/objects/grid.lua +++ b/objects/grid.lua @@ -1,6 +1,6 @@ local gridgen = {} -function gridgen:new(game,x,y,cellsize) +function gridgen:new(game,x,y,cellsize,tut) local Grid = game.objects.base:new(game,x,y,cellsize*5,cellsize*5) Grid.cellsize = cellsize @@ -11,6 +11,7 @@ function gridgen:new(game,x,y,cellsize) Grid.pinkarrows = game:Timer(1) Grid.bluearrows.loops = -1 Grid.pinkarrows.loops = 1 + Grid.tut = tut Grid.bluearrowsprite = game:newImage("arrows/blue.png") Grid.pinkarrowsprite = game:newImage("arrows/pink.png") Grid:register("Grid") diff --git a/scenes.lua b/scenes.lua index d10bcf4..c6f210a 100644 --- a/scenes.lua +++ b/scenes.lua @@ -5,10 +5,10 @@ function scenes:main(game) local cellsize = 44 local x = (game.WIDTH-cellsize*5)/2 local y = (game.HEIGHT-cellsize*5)/2 - local grid = game.objects.grid:new(game,x,y,cellsize) - game:summon(grid) local tut = game.objects.tutorial:new(game,game.WIDTH-25,25) game:summon(tut) + local grid = game.objects.grid:new(game,x,y,cellsize,tut) + game:summon(grid) local background = game.objects.background:new(game,game:newImage("pattern.png"),30,15) game:summon(background) local background = game.objects.background:new(game,game:newImage("pattern2.png"),30,-15)