/ld26

To get this branch, use:
bzr branch http://9ix.org/bzr/ld26

« back to all changes in this revision

Viewing changes to main.lua

  • Committer: Josh C
  • Date: 2013-04-28 18:52:04 UTC
  • Revision ID: josh@9ix.org-20130428185204-auxrflmqghvti2zm
put levels in their own file

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
7
7
require 'version'
8
8
 
9
9
require 'player'
 
10
require 'transition'
 
11
require 'displacer'
 
12
require 'inventory'
 
13
require 'flower'
 
14
require 'levels'
10
15
 
11
 
levels = {
12
 
   forest1 = {
13
 
      objects = function() return {
14
 
                      Tile:new{image = 'data/forest1-bg.png'},
15
 
                      Player:new{x = 200, y = 370, image = 'data/forest1-player.png'},
16
 
                      Tile:new{image = 'data/forest1-fg.png'}
17
 
                   } end,
18
 
   },
19
 
   shore = {
20
 
      objects = function() return {
21
 
                      Tile:new{image = 'data/shore-bg.png'},
22
 
                      Player:new{x = 145, y = 133, image = 'data/shore-player.png'},
23
 
                      Tile:new{image = 'data/shore-fg.png'}
24
 
                   } end
25
 
   }
26
 
}
 
16
require 'svg_levels'
27
17
 
28
18
GameView = View:extend {
 
19
   level = 'shore', --default level
29
20
   onNew = function (self)
30
 
              self:newLevel('forest1')
31
 
 
32
 
              --self:loadLayers('data/map.lua')
 
21
              --print('loading level: '..self.level)
 
22
              if not levels[self.level] then
 
23
                 error('no such level: '..self.level)
 
24
              end
 
25
              for _, obj in ipairs(levels[self.level].objects()) do
 
26
                 self:add(obj)
 
27
              end
 
28
              for _, obj in ipairs(svg_objects[self.level]) do
 
29
                 if not the.inventory.items[obj.name] then
 
30
                    self:add(obj)
 
31
                 end
 
32
              end
 
33
 
 
34
              self:add(the.inventory)
 
35
 
 
36
              self:flash({0,0,0})
 
37
 
33
38
              --self.focus = the.player
34
39
              --self:clampTo(self.map)
35
40
           end,
36
41
   draw = function (self, x, y)
37
42
             View.draw(self, x, y)
38
 
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
43
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
39
44
             love.graphics.print('version:' .. VERSION, 20, 570)
40
45
          end,
41
46
   onUpdate = function (self, dt)
42
 
                 if the.keys:justPressed('a') then
43
 
                    self:newLevel('forest1')
44
 
                 elseif the.keys:justPressed('b') then
45
 
                    self:newLevel('shore')
46
 
                 end
47
 
              end,
48
 
   newLevel = function (self, level)
49
 
                 self.sprites = levels[level].objects()
50
47
              end
51
48
}
52
49
 
56
53
              if DEBUG then
57
54
                 self.console:watch('VERSION', 'VERSION')
58
55
                 self.console:watch('updateTook', 'the.updateTook')
 
56
                 self.console:watch('view.tween.status', 'the.app.view.tween.status()')
 
57
                 self.console:watch('view.tween.active', 'the.app.view.tween.active')
59
58
                 --self.console:watch('drawTook', 'the.drawTook')
 
59
 
 
60
                 -- back off that dark overlay a bit
 
61
                 self.console.fill.fill[4] = 75
60
62
              end
61
63
           end,
62
64
   onUpdate = function (self, dt)
72
74
               end
73
75
            end
74
76
}
 
77
 
 
78
-- for accessing from debug console
 
79
function l(level)
 
80
   the.app.view = GameView:new{level = level}
 
81
end
 
 
b'\\ No newline at end of file'