/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 01:24:54 UTC
  • Revision ID: josh@9ix.org-20130428012454-b7kpooluezexnvde
fadeĀ out

Show diffs side-by-side

added added

removed removed

Lines of Context:
15
15
   forest1 = {
16
16
      objects = function() return {
17
17
                      Tile:new{image = 'data/forest1-bg.png'},
18
 
                      Player:new{x = 200, y = 370,
 
18
                      Player:new{x = 200, y = 380,
19
19
                                 minY = 330, maxY = 500,
20
20
                                 image = 'data/forest1-player.png'},
21
21
                      Tile:new{image = 'data/forest1-fg.png'}
28
28
                                 minY = 133, maxY = 133,
29
29
                                 image = 'data/shore-player.png'},
30
30
                      Tile:new{image = 'data/shore-fg.png'},
31
 
                      Transition:new{x = 10, y = 133, target = 'forest1'}
 
31
                      Transition:new{x = 10, y = 133, target = 'forest1',
 
32
                                     targetX = 735, targetY = 370}
32
33
                   } end
33
34
   }
34
35
}
35
36
 
36
37
GameView = View:extend {
 
38
   level = 'forest1', --default level
37
39
   onNew = function (self)
38
 
              self:newLevel('forest1')
39
 
 
40
 
              --self:loadLayers('data/map.lua')
 
40
              --print('loading level: '..self.level)
 
41
              for _, obj in ipairs(levels[self.level].objects()) do
 
42
                 self:add(obj)
 
43
              end
 
44
              for _, obj in ipairs(svg_objects[self.level]) do
 
45
                 self:add(obj)
 
46
              end
 
47
 
 
48
              self:flash({0,0,0})
 
49
 
41
50
              --self.focus = the.player
42
51
              --self:clampTo(self.map)
43
52
           end,
48
57
          end,
49
58
   onUpdate = function (self, dt)
50
59
                 if the.keys:justPressed('a') then
51
 
                    self:newLevel('forest1')
 
60
                    the.app.view = GameView:new{level = 'forest1'}
52
61
                 elseif the.keys:justPressed('b') then
53
 
                    self:newLevel('shore')
54
 
                 end
55
 
              end,
56
 
   newLevel = function (self, level)
57
 
                 self.sprites = levels[level].objects()
58
 
                 for _, obj in ipairs(svg_objects[level]) do
59
 
                    self:add(obj)
 
62
                    the.app.view = GameView:new{level = 'shore'}
60
63
                 end
61
64
              end
62
65
}
67
70
              if DEBUG then
68
71
                 self.console:watch('VERSION', 'VERSION')
69
72
                 self.console:watch('updateTook', 'the.updateTook')
 
73
                 self.console:watch('view.tween.status', 'the.app.view.tween.status()')
 
74
                 self.console:watch('view.tween.active', 'the.app.view.tween.active')
70
75
                 --self.console:watch('drawTook', 'the.drawTook')
71
76
 
72
77
                 -- back off that dark overlay a bit