/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 22:53:39 UTC
  • Revision ID: josh@9ix.org-20130427225339-6b4me5c8wi7y3jl0
pull data from svg to place objects into the world

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 = 370,
 
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
                   } end
 
33
   }
 
34
}
10
35
 
11
36
GameView = View:extend {
12
37
   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)
 
38
              self:newLevel('forest1')
19
39
 
20
40
              --self:loadLayers('data/map.lua')
21
41
              --self.focus = the.player
24
44
   draw = function (self, x, y)
25
45
             View.draw(self, x, y)
26
46
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
27
 
          end
 
47
             love.graphics.print('version:' .. VERSION, 20, 570)
 
48
          end,
 
49
   onUpdate = function (self, dt)
 
50
                 if the.keys:justPressed('a') then
 
51
                    self:newLevel('forest1')
 
52
                 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)
 
60
                 end
 
61
              end
28
62
}
29
63
 
30
64
the.app = App:new {
34
68
                 self.console:watch('VERSION', 'VERSION')
35
69
                 self.console:watch('updateTook', 'the.updateTook')
36
70
                 --self.console:watch('drawTook', 'the.drawTook')
 
71
 
 
72
                 -- back off that dark overlay a bit
 
73
                 self.console.fill.fill[4] = 75
37
74
              end
38
75
           end,
39
76
   onUpdate = function (self, dt)