ma_ing room for level editorgit add -A

This commit is contained in:
0x81c 2015-03-17 02:15:28 -04:00
parent 973a8ab25b
commit ec68721e7a
4 changed files with 4 additions and 3 deletions

View file

@ -1,5 +1,5 @@
function love.conf(t) function love.conf(t)
t.window.width = 700 t.window.width = 900
t.window.height = 700 t.window.height = 640
t.window.title = "CHROMA SOLSTICE" t.window.title = "CHROMA SOLSTICE"
end end

0
dialogue_manager.lua Normal file
View file

View file

@ -8,7 +8,7 @@ function npc:initialize(x, y, color, name)
collision = "unmoveable", collision = "unmoveable",
sprite = sprites.npc[name][color], sprite = sprites.npc[name][color],
onBump = function(self) onBump = function(self)
self.tal_ing = true
end, end,
}) })
end end

View file

@ -10,6 +10,7 @@ require "art"
require "assorted" require "assorted"
require "switch" require "switch"
require "door" require "door"
require "dialogue_manager"
function Room:initialize(t) function Room:initialize(t)
self.player = {} self.player = {}