/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
9
9
require 'player'
10
10
require 'transition'
11
11
require 'displacer'
 
12
require 'inventory'
 
13
require 'flower'
 
14
require 'levels'
 
15
 
12
16
require 'svg_levels'
13
17
 
14
 
levels = {
15
 
   forest1 = {
16
 
      objects = function() return {
17
 
                      Tile:new{image = 'data/forest1-bg.png'},
18
 
                      Player:new{x = 200, y = 380,
19
 
                                 minY = 330, maxY = 500,
20
 
                                 image = 'data/forest1-player.png'},
21
 
                      Tile:new{image = 'data/forest1-fg.png'}
22
 
                   } end,
23
 
   },
24
 
   shore = {
25
 
      objects = function() return {
26
 
                      Tile:new{image = 'data/shore-bg.png'},
27
 
                      Player:new{x = 145, y = 133,
28
 
                                 minY = 133, maxY = 133,
29
 
                                 image = 'data/shore-player.png'},
30
 
                      Tile:new{image = 'data/shore-fg.png'},
31
 
                      Transition:new{x = 10, y = 133, target = 'forest1',
32
 
                                     targetX = 735, targetY = 370}
33
 
                   } end
34
 
   }
35
 
}
36
 
 
37
18
GameView = View:extend {
38
 
   level = 'forest1', --default level
39
19
   onNew = function (self)
40
20
              --print('loading level: '..self.level)
 
21
              if not levels[self.level] then
 
22
                 error('no such level: '..self.level)
 
23
              end
41
24
              for _, obj in ipairs(levels[self.level].objects()) do
42
25
                 self:add(obj)
43
26
              end
44
27
              for _, obj in ipairs(svg_objects[self.level]) do
45
 
                 self:add(obj)
 
28
                 if not the.inventory.items[obj.name] then
 
29
                    self:add(obj)
 
30
                 end
46
31
              end
47
32
 
 
33
              self:add(the.inventory)
 
34
 
48
35
              self:flash({0,0,0})
49
36
 
50
37
              --self.focus = the.player
52
39
           end,
53
40
   draw = function (self, x, y)
54
41
             View.draw(self, x, y)
55
 
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
56
 
             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)
57
44
          end,
58
45
   onUpdate = function (self, dt)
59
 
                 if the.keys:justPressed('a') then
60
 
                    the.app.view = GameView:new{level = 'forest1'}
61
 
                 elseif the.keys:justPressed('b') then
62
 
                    the.app.view = GameView:new{level = 'shore'}
63
 
                 end
64
46
              end
65
47
}
66
48
 
67
49
the.app = App:new {
 
50
   level = 'shore', --default level
68
51
   onRun = function (self)
69
 
              self.view = GameView:new()
 
52
              print('Version: ' .. VERSION)
 
53
              self.view = GameView:new{level = self.level}
70
54
              if DEBUG then
71
55
                 self.console:watch('VERSION', 'VERSION')
72
56
                 self.console:watch('updateTook', 'the.updateTook')
91
75
               end
92
76
            end
93
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'