/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 02:02:58 UTC
  • Revision ID: josh@9ix.org-20130428020258-u7iwtprl6maa4634
village, lake

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
9
9
require 'player'
10
10
require 'transition'
11
11
require 'displacer'
12
 
require 'inventory'
13
 
require 'flower'
14
 
 
15
12
require 'svg_levels'
16
13
 
17
14
levels = {
54
51
}
55
52
 
56
53
GameView = View:extend {
57
 
   level = 'shore', --default level
 
54
   level = 'forest1', --default level
58
55
   onNew = function (self)
59
56
              --print('loading level: '..self.level)
60
57
              for _, obj in ipairs(levels[self.level].objects()) do
61
58
                 self:add(obj)
62
59
              end
63
60
              for _, obj in ipairs(svg_objects[self.level]) do
64
 
                 if not the.inventory.items[obj.name] then
65
 
                    self:add(obj)
66
 
                 end
 
61
                 self:add(obj)
67
62
              end
68
63
 
69
 
              self:add(the.inventory)
70
 
 
71
64
              self:flash({0,0,0})
72
65
 
73
66
              --self.focus = the.player
75
68
           end,
76
69
   draw = function (self, x, y)
77
70
             View.draw(self, x, y)
78
 
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
71
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
79
72
             love.graphics.print('version:' .. VERSION, 20, 570)
80
73
          end,
81
74
   onUpdate = function (self, dt)