/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
7
7
require 'version'
8
8
 
9
9
require 'player'
 
10
require 'transition'
 
11
require 'displacer'
 
12
require 'svg_levels'
 
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
}
10
36
 
11
37
GameView = View:extend {
12
38
   onNew = function (self)
13
 
              bg = Tile:new{image = 'data/forest1-bg.png'}
14
 
              fg = Tile:new{image = 'data/forest1-fg.png'}
15
 
              the.player = Player:new{x = 196, y = 350}
16
 
              self:add(bg)
17
 
              self:add(the.player)
18
 
              self:add(fg)
 
39
              self:newLevel('forest1')
19
40
 
20
41
              --self:loadLayers('data/map.lua')
21
42
              --self.focus = the.player
25
46
             View.draw(self, x, y)
26
47
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
27
48
             love.graphics.print('version:' .. VERSION, 20, 570)
28
 
          end
 
49
          end,
 
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
 
62
              end
29
63
}
30
64
 
31
65
the.app = App:new {
35
69
                 self.console:watch('VERSION', 'VERSION')
36
70
                 self.console:watch('updateTook', 'the.updateTook')
37
71
                 --self.console:watch('drawTook', 'the.drawTook')
 
72
 
 
73
                 -- back off that dark overlay a bit
 
74
                 self.console.fill.fill[4] = 75
38
75
              end
39
76
           end,
40
77
   onUpdate = function (self, dt)