/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:
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'
 
15
 
 
16
require 'svg_levels'
10
17
 
11
18
GameView = View:extend {
12
19
   onNew = function (self)
13
 
              self:newLevel('forest1')
14
 
 
15
 
              --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
 
16
37
              --self.focus = the.player
17
38
              --self:clampTo(self.map)
18
39
           end,
19
40
   draw = function (self, x, y)
20
41
             View.draw(self, x, y)
21
 
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
22
 
             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)
23
44
          end,
24
45
   onUpdate = function (self, dt)
25
 
                 if the.keys:justPressed('a') then
26
 
                    self:newLevel('forest1')
27
 
                 elseif the.keys:justPressed('b') then
28
 
                    self:newLevel('shore')
29
 
                 end
30
 
              end,
31
 
   newLevel = function (self, level)
32
 
                 self.sprites = {}
33
 
                 bg = Tile:new{image = 'data/' .. level .. '-bg.png'}
34
 
                 fg = Tile:new{image = 'data/' .. level .. '-fg.png'}
35
 
                 the.player = Player:new{x = 196, y = 350}
36
 
                 self:add(bg)
37
 
                 self:add(the.player)
38
 
                 self:add(fg)
39
46
              end
40
47
}
41
48
 
42
49
the.app = App:new {
 
50
   level = 'shore', --default level
43
51
   onRun = function (self)
44
 
              self.view = GameView:new()
 
52
              print('Version: ' .. VERSION)
 
53
              self.view = GameView:new{level = self.level}
45
54
              if DEBUG then
46
55
                 self.console:watch('VERSION', 'VERSION')
47
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')
48
59
                 --self.console:watch('drawTook', 'the.drawTook')
 
60
 
 
61
                 -- back off that dark overlay a bit
 
62
                 self.console.fill.fill[4] = 75
49
63
              end
50
64
           end,
51
65
   onUpdate = function (self, dt)
61
75
               end
62
76
            end
63
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'