/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 20:31:58 UTC
  • Revision ID: josh@9ix.org-20130428203158-uan2kd0ybns063vb
cleanup

Show diffs side-by-side

added added

removed removed

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