/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
 
 
15
12
require 'svg_levels'
16
13
 
17
14
levels = {
34
31
                      Transition:new{x = 10, y = 133, target = 'forest1',
35
32
                                     targetX = 735, targetY = 370}
36
33
                   } end
37
 
   },
38
 
   lake = {
39
 
      objects = function() return {
40
 
                      Tile:new{image = 'data/lake-bg.png'},
41
 
                      Player:new{x = 540, y = 266,
42
 
                                 image = 'data/lake-player.png'},
43
 
                   }
44
 
                end
45
 
   },
46
 
   village = {
47
 
      objects = function() return {
48
 
                      Tile:new{image = 'data/village-bg.png'},
49
 
                      Player:new{x = 121, y = 440,
50
 
                                 image = 'data/village-player.png'},
51
 
                   }
52
 
                end
53
34
   }
54
35
}
55
36
 
56
37
GameView = View:extend {
57
 
   level = 'shore', --default level
58
38
   onNew = function (self)
59
 
              --print('loading level: '..self.level)
60
 
              for _, obj in ipairs(levels[self.level].objects()) do
61
 
                 self:add(obj)
62
 
              end
63
 
              for _, obj in ipairs(svg_objects[self.level]) do
64
 
                 if not the.inventory.items[obj.name] then
65
 
                    self:add(obj)
66
 
                 end
67
 
              end
68
 
 
69
 
              self:add(the.inventory)
70
 
 
71
 
              self:flash({0,0,0})
72
 
 
 
39
              self:newLevel('forest1')
 
40
 
 
41
              --self:loadLayers('data/map.lua')
73
42
              --self.focus = the.player
74
43
              --self:clampTo(self.map)
75
44
           end,
76
45
   draw = function (self, x, y)
77
46
             View.draw(self, x, y)
78
 
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
47
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
79
48
             love.graphics.print('version:' .. VERSION, 20, 570)
80
49
          end,
81
50
   onUpdate = function (self, dt)
82
51
                 if the.keys:justPressed('a') then
83
 
                    the.app.view = GameView:new{level = 'forest1'}
 
52
                    self:newLevel('forest1')
84
53
                 elseif the.keys:justPressed('b') then
85
 
                    the.app.view = GameView:new{level = 'shore'}
 
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)
86
61
                 end
87
62
              end
88
63
}
93
68
              if DEBUG then
94
69
                 self.console:watch('VERSION', 'VERSION')
95
70
                 self.console:watch('updateTook', 'the.updateTook')
96
 
                 self.console:watch('view.tween.status', 'the.app.view.tween.status()')
97
 
                 self.console:watch('view.tween.active', 'the.app.view.tween.active')
98
71
                 --self.console:watch('drawTook', 'the.drawTook')
99
72
 
100
73
                 -- back off that dark overlay a bit
114
87
               end
115
88
            end
116
89
}
117
 
 
118
 
function l(level)
119
 
   the.app.view = GameView:new{level = level}
120
 
end
 
 
b'\\ No newline at end of file'