/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 18:35:29 UTC
  • Revision ID: josh@9ix.org-20130427183529-0lqp56qq6m0yocn1
levels hash, scale player

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
10
 
14
11
levels = {
15
12
   forest1 = {
16
13
      objects = function() return {
17
14
                      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'},
 
15
                      Player:new{x = 200, y = 370, image = 'data/forest1-player.png'},
21
16
                      Tile:new{image = 'data/forest1-fg.png'}
22
17
                   } end,
23
18
   },
24
19
   shore = {
25
20
      objects = function() return {
26
21
                      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}
 
22
                      Player:new{x = 145, y = 133, image = 'data/shore-player.png'},
 
23
                      Tile:new{image = 'data/shore-fg.png'}
33
24
                   } end
34
25
   }
35
26
}
36
27
 
37
28
GameView = View:extend {
38
 
   level = 'forest1', --default level
39
29
   onNew = function (self)
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
 
 
 
30
              self:newLevel('forest1')
 
31
 
 
32
              --self:loadLayers('data/map.lua')
50
33
              --self.focus = the.player
51
34
              --self:clampTo(self.map)
52
35
           end,
57
40
          end,
58
41
   onUpdate = function (self, dt)
59
42
                 if the.keys:justPressed('a') then
60
 
                    the.app.view = GameView:new{level = 'forest1'}
 
43
                    self:newLevel('forest1')
61
44
                 elseif the.keys:justPressed('b') then
62
 
                    the.app.view = GameView:new{level = 'shore'}
 
45
                    self:newLevel('shore')
63
46
                 end
 
47
              end,
 
48
   newLevel = function (self, level)
 
49
                 self.sprites = levels[level].objects()
64
50
              end
65
51
}
66
52
 
70
56
              if DEBUG then
71
57
                 self.console:watch('VERSION', 'VERSION')
72
58
                 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')
75
59
                 --self.console:watch('drawTook', 'the.drawTook')
76
 
 
77
 
                 -- back off that dark overlay a bit
78
 
                 self.console.fill.fill[4] = 75
79
60
              end
80
61
           end,
81
62
   onUpdate = function (self, dt)