diff --git a/conf.lua b/conf.lua index 0b2c5c9..8044fbb 100644 --- a/conf.lua +++ b/conf.lua @@ -5,8 +5,8 @@ function love.conf(t) t.window.title = "Turris Monacoae" -- The window title (string) t.window.icon = nil -- Filepath to an image to use as the window's icon (string) - t.window.width = 640 -- The window width (number) - t.window.height = 480 -- The window height (number) + t.window.width = 800 -- The window width (number) + t.window.height = 600 -- The window height (number) t.window.borderless = false -- Remove all border visuals from the window (boolean) t.window.resizable = false -- Let the window be user-resizable (boolean) t.window.minwidth = 1 -- Minimum window width if the window is resizable (number) diff --git a/game.lua b/game.lua index 6d6ffd1..4e38639 100644 --- a/game.lua +++ b/game.lua @@ -23,6 +23,7 @@ function love.turris.newGame() o.setMap(turMap.getMap()) o.map.setState(2, 2, 1) o.map.setState(2, 3, 1) + o.map.setState(11, 9, 1) o.map.setState(2, 9, 2) o.map.setState(7, 3, 3) o.baseX = math.floor(o.map.width / 2 + 0.5) @@ -30,7 +31,7 @@ function love.turris.newGame() o.map.setState(o.baseX, o.baseY, 4) end o.update = function(dt) - o.dayTime = o.dayTime + dt * 0.2 + o.dayTime = o.dayTime + dt * 0.1 for i = 1, o.enemyCount do o.enemies[i].x = o.enemies[i].x+o.enemies[i].xVel*dt o.enemies[i].y = o.enemies[i].y+o.enemies[i].yVel*dt @@ -48,7 +49,7 @@ function love.turris.newGame() end o.drawMap = function() local dayTime = math.abs(math.sin(o.dayTime)) - lightWorld.setAmbientColor(dayTime * 239 + 15, dayTime * 191 + 31, dayTime * 175 + 63) + lightWorld.setAmbientColor(dayTime * 239 + 15, dayTime * 191 + 31, dayTime * 143 + 63) lightMouse.setPosition(love.mouse.getX(), love.mouse.getY(), 63) lightWorld.update() diff --git a/gfx/tower02_glow.png b/gfx/tower02_glow.png index 6639f53..f261c7b 100644 Binary files a/gfx/tower02_glow.png and b/gfx/tower02_glow.png differ diff --git a/main.lua b/main.lua index 77f3a16..6d6e4e3 100644 --- a/main.lua +++ b/main.lua @@ -17,7 +17,7 @@ function love.load() currentgamestate = 0 -- create game world turGame = love.turris.newGame() - turMap = love.turris.newMap(10, 10, 64, 48) + turMap = love.turris.newMap(13, 13, 64, 48) turGame.init() gameOverLayer = love.turris.newGameOverLayer()