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