/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-27 23:43:03 UTC
  • Revision ID: josh@9ix.org-20130427234303-35drcx68t13gb3b8
more transitions and collisions

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
 
 
16
12
require 'svg_levels'
17
13
 
 
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
 
18
37
GameView = View:extend {
19
 
   level = 'shore', --default level
20
38
   onNew = function (self)
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
 
 
 
39
              self:newLevel('forest1')
 
40
 
 
41
              --self:loadLayers('data/map.lua')
38
42
              --self.focus = the.player
39
43
              --self:clampTo(self.map)
40
44
           end,
41
45
   draw = function (self, x, y)
42
46
             View.draw(self, x, y)
43
 
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
47
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
44
48
             love.graphics.print('version:' .. VERSION, 20, 570)
45
49
          end,
46
50
   onUpdate = function (self, dt)
 
51
                 if the.keys:justPressed('a') then
 
52
                    self:newLevel('forest1')
 
53
                 elseif the.keys:justPressed('b') then
 
54
                    self:newLevel('shore')
 
55
                 end
 
56
              end,
 
57
   newLevel = function (self, level)
 
58
                 self.sprites = levels[level].objects()
 
59
                 for _, obj in ipairs(svg_objects[level]) do
 
60
                    self:add(obj)
 
61
                 end
47
62
              end
48
63
}
49
64
 
53
68
              if DEBUG then
54
69
                 self.console:watch('VERSION', 'VERSION')
55
70
                 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')
58
71
                 --self.console:watch('drawTook', 'the.drawTook')
59
72
 
60
73
                 -- back off that dark overlay a bit
74
87
               end
75
88
            end
76
89
}
77
 
 
78
 
function l(level)
79
 
   the.app.view = GameView:new{level = level}
80
 
end
 
 
b'\\ No newline at end of file'