Skip to content

Commit

Permalink
menu fix
Browse files Browse the repository at this point in the history
  • Loading branch information
PriorBlue committed Mar 30, 2014
1 parent 1aab93c commit 2608a31
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions conf.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 3 additions & 2 deletions game.lua
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,15 @@ 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)
o.baseY = math.floor(o.map.height / 2 + 0.5)
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
Expand All @@ -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()
Expand Down
Binary file modified gfx/tower02_glow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion main.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down

0 comments on commit 2608a31

Please sign in to comment.